From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 23 Nov 2021 16:49:30 +0000 (+0100)
Subject: basic: Rename SECONDARY_ARCHITECTURE to ARCHITECTURE_SECONDARY
X-Git-Tag: v250-rc1~155^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3c58ae13134abad5fb8ba10d6cc2345fcde8f19c;p=thirdparty%2Fsystemd.git

basic: Rename SECONDARY_ARCHITECTURE to ARCHITECTURE_SECONDARY

For easier integration with the _GPT_ALL_ARCHES macro in a future
commit.
---

diff --git a/src/basic/architecture.h b/src/basic/architecture.h
index d4f50141b43..eaee01348e4 100644
--- a/src/basic/architecture.h
+++ b/src/basic/architecture.h
@@ -67,7 +67,7 @@ int uname_architecture(void);
 #  else
 #    define LIB_ARCH_TUPLE "x86_64-linux-gnu"
 #  endif
-#  define SECONDARY_ARCHITECTURE ARCHITECTURE_X86
+#  define ARCHITECTURE_SECONDARY ARCHITECTURE_X86
 #elif defined(__i386__)
 #  define native_architecture() ARCHITECTURE_X86
 #  define LIB_ARCH_TUPLE "i386-linux-gnu"
@@ -75,11 +75,11 @@ int uname_architecture(void);
 #  if __BYTE_ORDER == __BIG_ENDIAN
 #    define native_architecture() ARCHITECTURE_PPC64
 #    define LIB_ARCH_TUPLE "ppc64-linux-gnu"
-#    define SECONDARY_ARCHITECTURE ARCHITECTURE_PPC
+#    define ARCHITECTURE_SECONDARY ARCHITECTURE_PPC
 #  else
 #    define native_architecture() ARCHITECTURE_PPC64_LE
 #    define LIB_ARCH_TUPLE  "powerpc64le-linux-gnu"
-#    define SECONDARY_ARCHITECTURE ARCHITECTURE_PPC_LE
+#    define ARCHITECTURE_SECONDARY ARCHITECTURE_PPC_LE
 #  endif
 #elif defined(__powerpc__)
 #  if __BYTE_ORDER == __BIG_ENDIAN
@@ -105,7 +105,7 @@ int uname_architecture(void);
 #elif defined(__s390x__)
 #  define native_architecture() ARCHITECTURE_S390X
 #  define LIB_ARCH_TUPLE "s390x-linux-gnu"
-#  define SECONDARY_ARCHITECTURE ARCHITECTURE_S390
+#  define ARCHITECTURE_SECONDARY ARCHITECTURE_S390
 #elif defined(__s390__)
 #  define native_architecture() ARCHITECTURE_S390
 #  define LIB_ARCH_TUPLE "s390-linux-gnu"
@@ -149,7 +149,7 @@ int uname_architecture(void);
 #  else
 #    define native_architecture() ARCHITECTURE_ARM64
 #    define LIB_ARCH_TUPLE "aarch64-linux-gnu"
-#    define SECONDARY_ARCHITECTURE ARCHITECTURE_ARM
+#    define ARCHITECTURE_SECONDARY ARCHITECTURE_ARM
 #  endif
 #elif defined(__arm__)
 #  if __BYTE_ORDER == __BIG_ENDIAN
diff --git a/src/basic/process-util.c b/src/basic/process-util.c
index bea53ccb7d5..4a6370811e4 100644
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@@ -1045,8 +1045,8 @@ unsigned long personality_from_string(const char *p) {
 
         if (architecture == native_architecture())
                 return PER_LINUX;
-#ifdef SECONDARY_ARCHITECTURE
-        if (architecture == SECONDARY_ARCHITECTURE)
+#ifdef ARCHITECTURE_SECONDARY
+        if (architecture == ARCHITECTURE_SECONDARY)
                 return PER_LINUX32;
 #endif
 
@@ -1058,9 +1058,9 @@ const char* personality_to_string(unsigned long p) {
 
         if (p == PER_LINUX)
                 architecture = native_architecture();
-#ifdef SECONDARY_ARCHITECTURE
+#ifdef ARCHITECTURE_SECONDARY
         else if (p == PER_LINUX32)
-                architecture = SECONDARY_ARCHITECTURE;
+                architecture = ARCHITECTURE_SECONDARY;
 #endif
 
         if (architecture < 0)
diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index 06d0319f750..71b153b240a 100644
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -1069,7 +1069,7 @@ int dissect_image(
                                         continue;
 
                                 designator = PARTITION_ROOT_SECONDARY;
-                                architecture = SECONDARY_ARCHITECTURE;
+                                architecture = ARCHITECTURE_SECONDARY;
                                 rw = !(pflags & GPT_FLAG_READ_ONLY);
                                 growfs = FLAGS_SET(pflags, GPT_FLAG_GROWFS);
 
@@ -1094,7 +1094,7 @@ int dissect_image(
 
                                 designator = PARTITION_ROOT_SECONDARY_VERITY;
                                 fstype = "DM_verity_hash";
-                                architecture = SECONDARY_ARCHITECTURE;
+                                architecture = ARCHITECTURE_SECONDARY;
                                 rw = false;
 
                         } else if (sd_id128_equal(type_id, GPT_ROOT_SECONDARY_VERITY_SIG)) {
@@ -1196,7 +1196,7 @@ int dissect_image(
                                         continue;
 
                                 designator = PARTITION_USR_SECONDARY;
-                                architecture = SECONDARY_ARCHITECTURE;
+                                architecture = ARCHITECTURE_SECONDARY;
                                 rw = !(pflags & GPT_FLAG_READ_ONLY);
                                 growfs = FLAGS_SET(pflags, GPT_FLAG_GROWFS);
 
@@ -1220,7 +1220,7 @@ int dissect_image(
 
                                 designator = PARTITION_USR_SECONDARY_VERITY;
                                 fstype = "DM_verity_hash";
-                                architecture = SECONDARY_ARCHITECTURE;
+                                architecture = ARCHITECTURE_SECONDARY;
                                 rw = false;
 
                         } else if (sd_id128_equal(type_id, GPT_USR_SECONDARY_VERITY_SIG)) {