shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-20 14:03:39 +03:00
Code

gpt: fix native uuids for s390x

Browse Source 
__s390__ is defined for both s390 and s390x. Hence, we need to define
the native uuids for s390x at first.

(cherry picked from commit 4565246911adbdd1b20d8944c0754772788a768c)
(cherry picked from commit 8ad143e684c57d8fd9801fad3c379253d2cec92f)
This commit is contained in:
Yu Watanabe 2022-08-20 10:52:39 +09:00 committed by Zbigniew Jędrzejewski-Szmek
parent 683980d551
commit 5fe4b668cd
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/shared/gpt.h
View File

@ -21,8 +21,8 @@
#define GPT_ROOT_PPC64_LE SD_ID128_MAKE(c3,1c,45,e6,3f,39,41,2e,80,fb,48,09,c4,98,05,99)
#define GPT_ROOT_RISCV32 SD_ID128_MAKE(60,d5,a7,fe,8e,7d,43,5c,b7,14,3d,d8,16,21,44,e1)
#define GPT_ROOT_RISCV64 SD_ID128_MAKE(72,ec,70,a6,cf,74,40,e6,bd,49,4b,da,08,e8,f2,24)
#define GPT_ROOT_S390 SD_ID128_MAKE(08,a7,ac,ea,62,4c,4a,20,91,e8,6e,0f,a6,7d,23,f9)
#define GPT_ROOT_S390X SD_ID128_MAKE(5e,ea,d9,a9,fe,09,4a,1e,a1,d7,52,0d,00,53,13,06)
#define GPT_ROOT_S390 SD_ID128_MAKE(08,a7,ac,ea,62,4c,4a,20,91,e8,6e,0f,a6,7d,23,f9)
#define GPT_ROOT_TILEGX SD_ID128_MAKE(c5,0c,dd,70,38,62,4c,c3,90,e1,80,9a,8c,93,ee,2c)
#define GPT_ROOT_X86 SD_ID128_MAKE(44,47,95,40,f2,97,41,b2,9a,f7,d1,31,d5,f0,45,8a)
#define GPT_ROOT_X86_64 SD_ID128_MAKE(4f,68,bc,e3,e8,cd,4d,b1,96,e7,fb,ca,f9,84,b7,09)
@ -39,8 +39,8 @@
#define GPT_USR_PPC64_LE SD_ID128_MAKE(15,bb,03,af,77,e7,4d,4a,b1,2b,c0,d0,84,f7,49,1c)
#define GPT_USR_RISCV32 SD_ID128_MAKE(b9,33,fb,22,5c,3f,4f,91,af,90,e2,bb,0f,a5,07,02)
#define GPT_USR_RISCV64 SD_ID128_MAKE(be,ae,c3,4b,84,42,43,9b,a4,0b,98,43,81,ed,09,7d)
#define GPT_USR_S390 SD_ID128_MAKE(cd,0f,86,9b,d0,fb,4c,a0,b1,41,9e,a8,7c,c7,8d,66)
#define GPT_USR_S390X SD_ID128_MAKE(8a,4f,57,70,50,aa,4e,d3,87,4a,99,b7,10,db,6f,ea)
#define GPT_USR_S390 SD_ID128_MAKE(cd,0f,86,9b,d0,fb,4c,a0,b1,41,9e,a8,7c,c7,8d,66)
#define GPT_USR_TILEGX SD_ID128_MAKE(55,49,70,29,c7,c1,44,cc,aa,39,81,5e,d1,55,86,30)
#define GPT_USR_X86 SD_ID128_MAKE(75,25,0d,76,8c,c6,45,8e,bd,66,bd,47,cc,81,a8,12)
#define GPT_USR_X86_64 SD_ID128_MAKE(84,84,68,0c,95,21,48,c6,9c,11,b0,72,06,56,f6,9e)
@ -223,14 +223,6 @@
# define GPT_USR_NATIVE_VERITY GPT_USR_RISCV64_VERITY
# define GPT_USR_NATIVE_VERITY_SIG GPT_USR_RISCV64_VERITY_SIG
#elif defined(__s390__)
# define GPT_ROOT_NATIVE GPT_ROOT_S390
# define GPT_ROOT_NATIVE_VERITY GPT_ROOT_S390_VERITY
# define GPT_ROOT_NATIVE_VERITY_SIG GPT_ROOT_S390_VERITY_SIG
# define GPT_USR_NATIVE GPT_USR_S390
# define GPT_USR_NATIVE_VERITY GPT_USR_S390_VERITY
# define GPT_USR_NATIVE_VERITY_SIG GPT_USR_S390_VERITY_SIG
#elif defined(__s390x__)
# define GPT_ROOT_NATIVE GPT_ROOT_S390X
# define GPT_ROOT_NATIVE_VERITY GPT_ROOT_S390X_VERITY
@ -239,6 +231,14 @@
# define GPT_USR_NATIVE_VERITY GPT_USR_S390X_VERITY
# define GPT_USR_NATIVE_VERITY_SIG GPT_USR_S390X_VERITY_SIG
#elif defined(__s390__)
# define GPT_ROOT_NATIVE GPT_ROOT_S390
# define GPT_ROOT_NATIVE_VERITY GPT_ROOT_S390_VERITY
# define GPT_ROOT_NATIVE_VERITY_SIG GPT_ROOT_S390_VERITY_SIG
# define GPT_USR_NATIVE GPT_USR_S390
# define GPT_USR_NATIVE_VERITY GPT_USR_S390_VERITY
# define GPT_USR_NATIVE_VERITY_SIG GPT_USR_S390_VERITY_SIG
#elif defined(__tilegx__)
# define GPT_ROOT_NATIVE GPT_ROOT_TILEGX
# define GPT_ROOT_NATIVE_VERITY GPT_ROOT_TILEGX_VERITY