diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 22:19:36 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-10-14 23:22:23 +0100 |
commit | 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch) | |
tree | 76e74807bc479502e13866b581b6bf86734ec634 /sys-boot/systemd-boot | |
parent | 30d6f67c98d149508509d5e86f176d558793acc0 (diff) |
gentoo resync : 13.10.2019
Diffstat (limited to 'sys-boot/systemd-boot')
-rw-r--r-- | sys-boot/systemd-boot/Manifest | 3 | ||||
-rw-r--r-- | sys-boot/systemd-boot/files/239-debug-extra.patch | 40 | ||||
-rw-r--r-- | sys-boot/systemd-boot/files/239-stat-0.patch | 108 | ||||
-rw-r--r-- | sys-boot/systemd-boot/files/239-stat-1.patch | 74 |
4 files changed, 0 insertions, 225 deletions
diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest index b230514f6ac5..b286775a86e1 100644 --- a/sys-boot/systemd-boot/Manifest +++ b/sys-boot/systemd-boot/Manifest @@ -1,7 +1,4 @@ AUX 237-libshared-static.patch 659 BLAKE2B f97c3c4e9d6ef3da674bc74fce8326d18fe1ebd4008e0929f1362ef0c2e854a67c8786c0b4ce9b29aee2b4409c54c668429f61e3c4ab85844d72c3d060b41925 SHA512 79cd97a176c91c76b512bce5f30605d673fb5480921cc76e221da9e78a8f7caec802efb481f8811c7aefba2901d007e340ba032a07a53e907f77e4bbd52169a7 -AUX 239-debug-extra.patch 1641 BLAKE2B 37dae0aa6fb95be3f6b7ad5647ddc7e6e7cf6654e0119c5a41280a0db630d13746d5aaa0d1de8e66f49525a0b5a25f4f1136e0b8edc27e628cc82b386f5c0759 SHA512 091f4a0a6d8f4f5963002f33ebafa36f00f7635caafa14ac618ed7c5e08538cffbe655930802e14a0f744851ed7acacc217d2ad7e625627eeb82e14cc3fabd4a -AUX 239-stat-0.patch 3553 BLAKE2B 225dd5e8e001a10a33c7ecb5c1378589b3eeecbea4fc746f27cc72d8eb8787c6966b8787c5922f0d0cefa28ac966c7c4f65ed341335d4105bc109df14110604c SHA512 a982c6384fcad2a1ad709564e932231e837ef799b764bbfa73eff5c42635a4bdc0dcf36e72300482ed188b492da723d3cd7ae04dda9b2c16c70fd1871c556a46 -AUX 239-stat-1.patch 2553 BLAKE2B 123a9488f7e2c9c2b70cb87ecc45be54b19b18660a2b238d028227e19cb7ba4933a115e2e82652b3179462ed0d2115058bff5d8d0212f439a919857f083c318d SHA512 6aee279728d0e609956c825ced6d2c00d8f4905327492c0348ad6ee8e862287b101ec4e2f1daa19533cf51f2ba1a15f0ea2dd6ccde44a4ff1b0fb151ffc7381e DIST systemd-241.tar.gz 7640538 BLAKE2B 69d7196fee0d0ad06ea8d7c78b0299cc17517ecce3ca4c0b1181a3fbb13bc2627629156785051e2ff427dcc21414f7a078724c6409ebaa431618e4799ebcd50a SHA512 a7757574590e8aa37e1291ea0b2c5eb03a8d8062fe9462fa5b0bf50830c933e2b301d106c70d904f94afc0aa8e43a8acfd11926dfa25b1b89174580e491e545e DIST systemd-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e EBUILD systemd-boot-241.ebuild 2352 BLAKE2B bcc51f97daccf09f929ff56947733721a70c87e5a8842a2c3d3e2fba23dc28a9cd46e16f4b39a5b56ae4707dbfcf61ea346d7d313024378fd8c97361d574da99 SHA512 26949284b57ba3ec387984293e6646f9a9eab168659c33c1c24e16e3ffd00603e4bea39f7d8c74fc1cc4da37cf75ce9f27ff1a036ae8612b130a94182ae0017d diff --git a/sys-boot/systemd-boot/files/239-debug-extra.patch b/sys-boot/systemd-boot/files/239-debug-extra.patch deleted file mode 100644 index 19db590257cf..000000000000 --- a/sys-boot/systemd-boot/files/239-debug-extra.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8f6b442a78d0b485f044742ad90b2e8271b4e68e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> -Date: Sun, 19 Aug 2018 19:11:30 +0200 -Subject: [PATCH] meson: rename -Ddebug to -Ddebug-extra - -Meson added -Doptimization and -Ddebug options, which obviously causes -a conflict with our -Ddebug options. Let's rename it. - -Fixes #9883. ---- - meson.build | 2 +- - meson_options.txt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index f79ac4b12e7..2209c935ad6 100644 ---- a/meson.build -+++ b/meson.build -@@ -763,7 +763,7 @@ substs.set('DEBUGTTY', get_option('debug-tty')) - - enable_debug_hashmap = false - enable_debug_mmap_cache = false --foreach name : get_option('debug') -+foreach name : get_option('debug-extra') - if name == 'hashmap' - enable_debug_hashmap = true - elif name == 'mmap-cache' -diff --git a/meson_options.txt b/meson_options.txt -index e3140c8c110..7b1f61bf464 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -45,7 +45,7 @@ option('debug-shell', type : 'string', value : '/bin/sh', - description : 'path to debug shell binary') - option('debug-tty', type : 'string', value : '/dev/tty9', - description : 'specify the tty device for debug shell') --option('debug', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [], -+option('debug-extra', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [], - description : 'enable extra debugging') - option('memory-accounting-default', type : 'boolean', - description : 'enable MemoryAccounting= by default') diff --git a/sys-boot/systemd-boot/files/239-stat-0.patch b/sys-boot/systemd-boot/files/239-stat-0.patch deleted file mode 100644 index e136b703a2f5..000000000000 --- a/sys-boot/systemd-boot/files/239-stat-0.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 75720bff62a84896e9a0654afc7cf9408cf89a38 Mon Sep 17 00:00:00 2001 -From: Filipe Brandenburger <filbranden@google.com> -Date: Sun, 15 Jul 2018 22:43:35 -0700 -Subject: [PATCH] build-sys: Detect whether struct statx is defined in - sys/stat.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Starting with glibc 2.27.9000-36.fc29, include file sys/stat.h will have a -definition for struct statx, in which case include file linux/stat.h should be -avoided, in order to prevent a duplicate definition. - - In file included from ../src/basic/missing.h:18, - from ../src/basic/util.h:28, - from ../src/basic/hashmap.h:10, - from ../src/shared/bus-util.h:12, - from ../src/libsystemd/sd-bus/bus-creds.c:11: - /usr/include/linux/stat.h:99:8: error: redefinition of ‘struct statx’ - struct statx { - ^~~~~ - In file included from /usr/include/sys/stat.h:446, - from ../src/basic/util.h:19, - from ../src/basic/hashmap.h:10, - from ../src/shared/bus-util.h:12, - from ../src/libsystemd/sd-bus/bus-creds.c:11: - /usr/include/bits/statx.h:36:8: note: originally defined here - struct statx - ^~~~~ - -Extend our meson.build to look for struct statx when only sys/stat.h is -included and, in that case, do not include linux/stat.h anymore. - -Tested that systemd builds correctly when using a glibc version that includes a -definition for struct statx. - -glibc Fedora RPM update: -https://src.fedoraproject.org/rpms/glibc/c/28cb5d31fc1e5887912283c889689c47076278ae - -glibc upstream commit: -https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=fd70af45528d59a00eb3190ef6706cb299488fcd ---- - meson.build | 5 +++++ - src/basic/missing.h | 5 ++++- - src/basic/xattr-util.c | 1 - - 3 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index dd904c7148..68423bdfa5 100644 ---- a/meson.build -+++ b/meson.build -@@ -425,6 +425,7 @@ decl_headers = ''' - #include <sys/stat.h> - ''' - # FIXME: key_serial_t is only defined in keyutils.h, this is bound to fail -+# FIXME: these should use -D_GNU_SOURCE, since that is defined at build time - - foreach decl : ['char16_t', - 'char32_t', -@@ -439,6 +440,10 @@ foreach decl : ['char16_t', - conf.set10('HAVE_' + decl.underscorify().to_upper(), have) - endforeach - -+conf.set10('HAVE_STRUCT_STATX_IN_SYS_STAT_H', cc.sizeof('struct statx', prefix : ''' -+#include <sys/stat.h> -+''', args : '-D_GNU_SOURCE') > 0) -+ - foreach decl : [['IFLA_INET6_ADDR_GEN_MODE', 'linux/if_link.h'], - ['IN6_ADDR_GEN_MODE_STABLE_PRIVACY', 'linux/if_link.h'], - ['IFLA_VRF_TABLE', 'linux/if_link.h'], -diff --git a/src/basic/missing.h b/src/basic/missing.h -index 71a07d0574..14ad3d4914 100644 ---- a/src/basic/missing.h -+++ b/src/basic/missing.h -@@ -15,7 +15,6 @@ - #include <linux/neighbour.h> - #include <linux/oom.h> - #include <linux/rtnetlink.h> --#include <linux/stat.h> - #include <net/ethernet.h> - #include <stdlib.h> - #include <sys/resource.h> -@@ -25,6 +24,10 @@ - #include <uchar.h> - #include <unistd.h> - -+#if !HAVE_STRUCT_STATX_IN_SYS_STAT_H -+#include <linux/stat.h> -+#endif -+ - #if HAVE_AUDIT - #include <libaudit.h> - #endif -diff --git a/src/basic/xattr-util.c b/src/basic/xattr-util.c -index c5c55ea846..0ee0979837 100644 ---- a/src/basic/xattr-util.c -+++ b/src/basic/xattr-util.c -@@ -2,7 +2,6 @@ - - #include <errno.h> - #include <fcntl.h> --#include <linux/stat.h> - #include <stdint.h> - #include <stdlib.h> - #include <string.h> --- -2.19.1 - diff --git a/sys-boot/systemd-boot/files/239-stat-1.patch b/sys-boot/systemd-boot/files/239-stat-1.patch deleted file mode 100644 index 1104de3c9c1a..000000000000 --- a/sys-boot/systemd-boot/files/239-stat-1.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 9c869d08d82c73f62ab3527567858ce4b0cf1257 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> -Date: Wed, 18 Jul 2018 17:26:17 +0200 -Subject: [PATCH] meson: unify linux/stat.h check with other checks and use - _GNU_SOURCE - -Using _GNU_SOURCE is better because that's how we include the headers in the -actual build, and some headers define different stuff when it is defined. -sys/stat.h for example defines 'struct statx' conditionally. ---- - meson.build | 20 ++++++++++++++------ - src/basic/missing.h | 2 +- - 2 files changed, 15 insertions(+), 7 deletions(-) - -diff --git a/meson.build b/meson.build -index 68423bdfa5..99035d2306 100644 ---- a/meson.build -+++ b/meson.build -@@ -421,11 +421,9 @@ decl_headers = ''' - #include <uchar.h> - #include <linux/ethtool.h> - #include <linux/fib_rules.h> --#include <linux/stat.h> - #include <sys/stat.h> - ''' - # FIXME: key_serial_t is only defined in keyutils.h, this is bound to fail --# FIXME: these should use -D_GNU_SOURCE, since that is defined at build time - - foreach decl : ['char16_t', - 'char32_t', -@@ -436,13 +434,23 @@ foreach decl : ['char16_t', - ] - - # We get -1 if the size cannot be determined -- have = cc.sizeof(decl, prefix : decl_headers) > 0 -+ have = cc.sizeof(decl, prefix : decl_headers, args : '-D_GNU_SOURCE') > 0 -+ -+ if decl == 'struct statx' -+ if have -+ want_linux_stat_h = false -+ else -+ have = cc.sizeof(decl, -+ prefix : decl_headers + '#include <linux/stat.h>', -+ args : '-D_GNU_SOURCE') > 0 -+ want_linux_stat_h = have -+ endif -+ endif -+ - conf.set10('HAVE_' + decl.underscorify().to_upper(), have) - endforeach - --conf.set10('HAVE_STRUCT_STATX_IN_SYS_STAT_H', cc.sizeof('struct statx', prefix : ''' --#include <sys/stat.h> --''', args : '-D_GNU_SOURCE') > 0) -+conf.set10('WANT_LINUX_STAT_H', want_linux_stat_h) - - foreach decl : [['IFLA_INET6_ADDR_GEN_MODE', 'linux/if_link.h'], - ['IN6_ADDR_GEN_MODE_STABLE_PRIVACY', 'linux/if_link.h'], -diff --git a/src/basic/missing.h b/src/basic/missing.h -index 14ad3d4914..9044683b15 100644 ---- a/src/basic/missing.h -+++ b/src/basic/missing.h -@@ -24,7 +24,7 @@ - #include <uchar.h> - #include <unistd.h> - --#if !HAVE_STRUCT_STATX_IN_SYS_STAT_H -+#if WANT_LINUX_STAT_H - #include <linux/stat.h> - #endif - --- -2.19.1 - |