[haiku-commits] haiku: hrev46133 - headers/os/package src/add-ons/kernel/file_systems/packagefs/package src/kits/package
- From: revol@xxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 29 Sep 2013 19:49:35 +0200 (CEST)
hrev46133 adds 1 changeset to branch 'master'
old head: 75453edc01ab20bce7bf2a264da91433bb1b3576
new head: 624ba5482b6c126c8c460b6c169592cb3afc4291
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=624ba54+%5E75453ed
----------------------------------------------------------------------------
624ba54: Add missing architectures for packages
The list in packagefs wasn't in sync anyway.
[ François Revol <revol@xxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev46133
Commit: 624ba5482b6c126c8c460b6c169592cb3afc4291
URL: http://cgit.haiku-os.org/haiku/commit/?id=624ba54
Author: François Revol <revol@xxxxxxx>
Date: Sun Sep 29 17:48:26 2013 UTC
----------------------------------------------------------------------------
3 files changed, 10 insertions(+)
headers/os/package/PackageArchitecture.h | 3 +++
src/add-ons/kernel/file_systems/packagefs/package/Package.cpp | 4 ++++
src/kits/package/PackageInfo.cpp | 3 +++
----------------------------------------------------------------------------
diff --git a/headers/os/package/PackageArchitecture.h
b/headers/os/package/PackageArchitecture.h
index da2739f..0918422 100644
--- a/headers/os/package/PackageArchitecture.h
+++ b/headers/os/package/PackageArchitecture.h
@@ -15,6 +15,9 @@ enum BPackageArchitecture {
B_PACKAGE_ARCHITECTURE_X86_GCC2 = 2,
B_PACKAGE_ARCHITECTURE_SOURCE = 3,
B_PACKAGE_ARCHITECTURE_X86_64 = 4,
+ B_PACKAGE_ARCHITECTURE_PPC = 5,
+ B_PACKAGE_ARCHITECTURE_ARM = 6,
+ B_PACKAGE_ARCHITECTURE_M68K = 7,
//
B_PACKAGE_ARCHITECTURE_ENUM_COUNT,
};
diff --git a/src/add-ons/kernel/file_systems/packagefs/package/Package.cpp
b/src/add-ons/kernel/file_systems/packagefs/package/Package.cpp
index c5fe30b..318ea90 100644
--- a/src/add-ons/kernel/file_systems/packagefs/package/Package.cpp
+++ b/src/add-ons/kernel/file_systems/packagefs/package/Package.cpp
@@ -62,6 +62,10 @@ const char* const
kArchitectureNames[B_PACKAGE_ARCHITECTURE_ENUM_COUNT] = {
"x86",
"x86_gcc2",
"source",
+ "x86_64",
+ "ppc",
+ "arm",
+ "m68k"
};
diff --git a/src/kits/package/PackageInfo.cpp b/src/kits/package/PackageInfo.cpp
index 72f6901..562943b 100644
--- a/src/kits/package/PackageInfo.cpp
+++ b/src/kits/package/PackageInfo.cpp
@@ -66,6 +66,9 @@
BPackageInfo::kArchitectureNames[B_PACKAGE_ARCHITECTURE_ENUM_COUNT] = {
"x86_gcc2",
"source",
"x86_64",
+ "ppc",
+ "arm",
+ "m68k"
};
Other related posts:
- » [haiku-commits] haiku: hrev46133 - headers/os/package src/add-ons/kernel/file_systems/packagefs/package src/kits/package - revol
