summaryrefslogtreecommitdiff |
diff options
author | Michal Koutný <mkoutny@suse.com> | 2019-01-16 16:36:52 +0100 |
---|---|---|
committer | Michal Koutný <mkoutny@suse.com> | 2019-01-16 16:36:52 +0100 |
commit | e161c3b53c359440a0bb11f5b026be3e054e6ed6 (patch) | |
tree | 96896471cdbd9de3d49e648bcb8b8973718d3d4d | |
parent | d040276f14b68eef780999c3a5f414f12ce4b94b (diff) | |
parent | 699fb0977dab2dc862141bdbe7d430bdf5ee35e8 (diff) |
Merge remote-tracking branch 'origin/users/msuchanek/cve/linux-4.4/for-next' into users/mkoutny/cve/linux-4.4/sorted-series
Conflicts:
series.conf: update rpmify patches out of sorted section
-rw-r--r-- | patches.rpmify/powerpc-boot-Request-no-dynamic-linker-for-boot-wrap.patch | 78 | ||||
-rw-r--r-- | patches.rpmify/ppc64le-build-vmlinux.patch | 25 | ||||
-rwxr-xr-x | scripts/python/tests/test_header.py | 308 | ||||
-rwxr-xr-x | scripts/tar-up.sh | 3 | ||||
-rw-r--r-- | series.conf | 2 |
5 files changed, 228 insertions, 188 deletions
diff --git a/patches.rpmify/powerpc-boot-Request-no-dynamic-linker-for-boot-wrap.patch b/patches.rpmify/powerpc-boot-Request-no-dynamic-linker-for-boot-wrap.patch new file mode 100644 index 0000000000..4fe8ea4f6d --- /dev/null +++ b/patches.rpmify/powerpc-boot-Request-no-dynamic-linker-for-boot-wrap.patch @@ -0,0 +1,78 @@ +From 1d2c031c6a487bc3564a44e746e8b0e2f7d3187d Mon Sep 17 00:00:00 2001 +From: Nicholas Piggin <npiggin@gmail.com> +Date: Mon, 28 Nov 2016 12:42:26 +1100 +Subject: [PATCH] powerpc/boot: Request no dynamic linker for boot wrapper + +References: bsc#1070805 +Patch-mainline: v4.10-rc1 +Git-commit: ff45000fcb56b5b0f1a14a865d3541746d838a0a + +The boot wrapper performs its own relocations and does not require +PT_INTERP segment. However currently we don't tell the linker that. + +Prior to binutils 2.28 that works OK. But since binutils commit +1a9ccd70f9a7 ("Fix the linker so that it will not silently generate ELF +binaries with invalid program headers. Fix readelf to report such +invalid binaries.") binutils tries to create a program header segment +due to PT_INTERP, and the link fails because there is no space for it: + + ld: arch/powerpc/boot/zImage.pseries: Not enough room for program headers, try linking with -N + ld: final link failed: Bad value + +So tell the linker not to do that, by passing --no-dynamic-linker. + +Cc: stable@vger.kernel.org +Reported-by: Anton Blanchard <anton@samba.org> +Signed-off-by: Nicholas Piggin <npiggin@gmail.com> +[mpe: Drop dependency on ld-version.sh and massage change log] +Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> +Acked-by: Michal Suchanek <msuchanek@suse.de> +--- + arch/powerpc/boot/wrapper | 24 +++++++++++++++++++++++- + 1 file changed, 23 insertions(+), 1 deletion(-) + +diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper +index ceaa75d5a684..be4831acda22 100755 +--- a/arch/powerpc/boot/wrapper ++++ b/arch/powerpc/boot/wrapper +@@ -161,6 +161,28 @@ case "$elfformat" in + elf32-powerpc) format=elf32ppc ;; + esac + ++ld_version() ++{ ++ # Poached from scripts/ld-version.sh, but we don't want to call that because ++ # this script (wrapper) is distributed separately from the kernel source. ++ # Extract linker version number from stdin and turn into single number. ++ awk '{ ++ gsub(".*\\)", ""); ++ gsub(".*version ", ""); ++ gsub("-.*", ""); ++ split($1,a, "."); ++ print a[1]*100000000 + a[2]*1000000 + a[3]*10000; ++ exit ++ }' ++} ++ ++# Do not include PT_INTERP segment when linking pie. Non-pie linking ++# just ignores this option. ++LD_VERSION=$(${CROSS}ld --version | ld_version) ++LD_NO_DL_MIN_VERSION=$(echo 2.26 | ld_version) ++if [ "$LD_VERSION" -ge "$LD_NO_DL_MIN_VERSION" ] ; then ++ nodl="--no-dynamic-linker" ++fi + + platformo=$object/"$platform".o + lds=$object/zImage.lds +@@ -412,7 +434,7 @@ if [ "$platform" != "miboot" ]; then + if [ -n "$link_address" ] ; then + text_start="-Ttext $link_address" + fi +- ${CROSS}ld -m $format -T $lds $text_start $pie -o "$ofile" \ ++ ${CROSS}ld -m $format -T $lds $text_start $pie $nodl -o "$ofile" \ + $platformo $tmp $object/wrapper.a + rm $tmp + fi +-- +2.19.2 + diff --git a/patches.rpmify/ppc64le-build-vmlinux.patch b/patches.rpmify/ppc64le-build-vmlinux.patch deleted file mode 100644 index 997def9a00..0000000000 --- a/patches.rpmify/ppc64le-build-vmlinux.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Dinar Valeev <dvaleev@suse.com> -Subject: PPC: Build only vmlinux target -Patch-Mainline: no, tbd (ancient patch) - -References: bsc#1070805 - -The zImage target doesn't build on ppc64le and we only ever -care about the resulting vmlinux file anyway, so drop compilation -of the zImage target for us. - -Signed-off-by: Dinar Valeev <dvaleev@suse.com> -Signed-off-by: Alexander Graf <agraf@suse.de> - ---- a/arch/powerpc/Makefile -+++ b/arch/powerpc/Makefile -@@ -222,7 +222,7 @@ core-$(CONFIG_PERF_EVENTS) += arch/power - drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/ - - # Default to zImage, override when needed --all: zImage -+all: vmlinux - - # With make 3.82 we cannot mix normal and wildcard targets - BOOT_TARGETS1 := zImage zImage.initrd uImage - diff --git a/scripts/python/tests/test_header.py b/scripts/python/tests/test_header.py index 0b80a27ed1..003c0c84d9 100755 --- a/scripts/python/tests/test_header.py +++ b/scripts/python/tests/test_header.py @@ -8,32 +8,17 @@ from io import StringIO from suse_git import header -# You'll see a slightly strange pattern here: -# try: -# self.sometest() -# self.assertTrue(False) -# except Exception, e: -# rest of test -# -# This is to test the exception contents. Python's unittest module -# allows us to assert that a particular exception is raised but -# it won't let us inspect the contents of it. The assertTrue(False) -# will cause a test failure if an exception isn't raised; The -# except HeaderException clause will cause a test failure if the -# exception isn't HeaderException. When adding new test cases, -# please follow this pattern when the test case is expecting to fail. - class TestHeaderChecker(unittest.TestCase): def test_empty(self): try: self.header = header.Checker("") except header.HeaderException as e: - self.assertTrue(e.errors(header.MissingTagError) == 4) + self.assertEqual(4, e.errors(header.MissingTagError)) self.assertTrue(e.tag_is_missing('patch-mainline')) self.assertTrue(e.tag_is_missing('from')) self.assertTrue(e.tag_is_missing('subject')) self.assertTrue(e.tag_is_missing('references')) - self.assertTrue(e.errors() == 4) + self.assertEqual(4, e.errors()) def test_subject_dupe(self): text = """ @@ -45,12 +30,11 @@ Git-commit: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa References: bsc#12345 Acked-by: developer@suse.com """ - try: + with self.assertRaises(header.HeaderException) as cm: self.header = header.Checker(text) - self.assertTrue(False) - except header.HeaderException as e: - self.assertTrue(e.errors(header.DuplicateTagError) == 1) - self.assertTrue(e.errors() == 1) + e = cm.exception + self.assertEqual(1, e.errors(header.DuplicateTagError)) + self.assertEqual(1, e.errors()) def test_patch_mainline_dupe(self): text = """ @@ -62,12 +46,12 @@ Git-commit: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa References: bsc#12345 Acked-by: developer@suse.com """ - try: + with self.assertRaises(header.HeaderException) as cm: self.header = header.Checker(text) - self.assertTrue(False) - except header.HeaderException as e: - self.assertTrue(e.errors(header.DuplicateTagError) == 1) - self.assertTrue(e.errors() == 1) + + e = cm.exception + self.assertEqual(1, e.errors(header.DuplicateTagError)) + self.assertEqual(1, e.errors()) def test_patch_mainline_empty(self): text = """ @@ -77,14 +61,14 @@ Patch-mainline: References: bsc#12345 Acked-by: developer@suse.com """ - try: + with self.assertRaises(header.HeaderException) as cm: self.header = header.Checker(text) - self.assertTrue(False) - except header.HeaderException as e: - self.assertTrue(e.errors(header.EmptyTagError) == 1) - self.assertTrue(e.errors(header.MissingTagError) == 1) - self.assertTrue(e.tag_is_missing('patch-mainline')) - self.assertTrue(e.errors() == 2) + + e = cm.exception + self.assertEqual(1, e.errors(header.EmptyTagError)) + self.assertEqual(1, e.errors(header.MissingTagError)) + self.assertTrue(e.tag_is_missing('patch-mainline')) + self.assertEqual(2, e.errors()) def test_patch_mainline_version_no_ack_or_sob(self): text = """ @@ -98,10 +82,10 @@ Git-commit: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa try: self.header = header.Checker(text) except header.HeaderException as e: - self.assertTrue(e.errors(header.MissingTagError) == 1) + self.assertEqual(1, e.errors(header.MissingTagError)) self.assertTrue(e.tag_is_missing('acked-by')) self.assertTrue(e.tag_is_missing('signed-off-by')) - self.assertTrue(e.errors() == 1) + self.assertEqual(1, e.errors()) def test_patch_mainline_version_correct_multi_ack(self): text = """ @@ -215,12 +199,12 @@ Patch-mainline: n/a References: bsc#12345 Acked-by: developer@suse.com """ - try: + with self.assertRaises(header.HeaderException) as cm: self.header = header.Checker(text) - self.assertTrue(False) - except header.HeaderException as e: - self.assertTrue(e.errors(header.FormatError) == 1) - self.assertTrue(e.errors() == 1) + + e = cm.exception + self.assertEqual(1, e.errors(header.FormatError)) + self.assertEqual(1, e.errors()) def test_patch_mainline_submitted_correct_ml(self): text = """ @@ -250,12 +234,12 @@ Patch-mainline: Submitted References: bsc#12345 Acked-by: developer@suse.com """ - try: + with self.assertRaises(header.HeaderException) as cm: self.header = header.Checker(text) - self.assertTrue(False) - except header.HeaderException as e: - self.assertTrue(e.errors(header.FormatError) == 1) - self.assertTrue(e.errors() == 1) + + e = cm.exception + self.assertEqual(1, e.errors(header.FormatError)) + self.assertEqual(1, e.errors()) def test_patch_mainline_submitted_detail_git_commit(self): text = """ @@ -266,12 +250,12 @@ Git-repo: git://host/valid/path/to/repo References: bsc#12345 Acked-by: developer@suse.com """ - try: + with self.assertRaises(header.HeaderException) as cm: self.header = header.Checker(text) - self.assertTrue(False) - except header.HeaderException as e: - self.assertTrue(e.errors(header.ExcludedTagError) == 1) - self.assertTrue(e.errors() == 1) + + e = cm.exception + self.assertEqual(1, e.errors(header.ExcludedTagError)) + self.assertEqual(1, e.errors()) # Required/Excluded conflict between Patch-mainline (Submitted) # and Git-commit @@ -284,13 +268,13 @@ Git-commit: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa References: bsc#12345 Acked-by: developer@suse.com """ - try: + with self.assertRaises(header.HeaderException) as cm: self.header = header.Checker(text) - self.assertTrue(False) - except header.HeaderException as e: - self.assertTrue(e.errors(header.MissingTagError) == 1) - self.assertTrue(e.errors(header.ExcludedTagError) == 1) - self.assertTrue(e.errors() == 2) + + e = cm.exception + self.assertEqual(1, e.errors(header.MissingTagError)) + self.assertEqual(1, e.errors(header.ExcludedTagError)) + self.assertEqual(2, e.errors()) def test_patch_mainline_submitted_no_detail(self): text = """ @@ -300,12 +284,12 @@ Patch-mainline: Submitted References: bsc#12345 Acked-by: developer@suse.com """ - try: + with self.assertRaises(header.HeaderException) as cm: self.header = header.Checker(text) - self.assertTrue(False) - except header.HeaderException as e: - self.assertTrue(e.errors(header.FormatError) == 1) - self.assertTrue(e.errors() == 1) + + e = cm.exception + self.assertEqual(1, e.errors(header.FormatError)) + self.assertEqual(1, e.errors()) def test_patch_mainline_never_no_detail(self): text = """ @@ -318,8 +302,8 @@ Acked-by: developer@suse.com try: self.header = header.Checker(text) except header.HeaderException as e: - self.assertTrue(e.errors(header.FormatError) == 1) - self.assertTrue(e.errors() == 1) + self.assertEqual(1, e.errors(header.FormatError)) + self.assertEqual(1, e.errors()) def test_patch_mainline_yes_with_detail(self): text = """ @@ -329,12 +313,12 @@ Patch-mainline: Yes, v4.1-rc1 References: bsc#12345 Acked-by: developer@suse.com """ - try: + with self.assertRaises(header.HeaderException) as cm: self.header = header.Checker(text) - self.assertTrue(False) - except header.HeaderException as e: - self.assertTrue(e.errors(header.FormatError) == 1) - self.assertTrue(e.errors() == 1) + + e = cm.exception + self.assertEqual(1, e.errors(header.FormatError)) + self.assertEqual(1, e.errors()) def test_patch_mainline_yes_no_detail(self): text = """ @@ -344,12 +328,12 @@ Patch-mainline: Yes References: bsc#12345 Acked-by: developer@suse.com """ - try: + with self.assertRaises(header.HeaderException) as cm: self.header = header.Checker(text) - self.assertTrue(False) - except header.HeaderException as e: - self.assertTrue(e.errors(header.FormatError) == 1) - self.assertTrue(e.errors() == 1) + + e = cm.exception + self.assertEqual(1, e.errors(header.FormatError)) + self.assertEqual(1, e.errors()) def test_patch_mainline_not_yet_no_detail(self): text = """ @@ -359,12 +343,12 @@ Patch-mainline: Not yet References: bsc#12345 Acked-by: developer@suse.com """ - try: + with self.assertRaises(header.HeaderException) as cm: self.header = header.Checker(text) - self.assertTrue(False) - except header.HeaderException as e: - self.assertTrue(e.errors(header.FormatError) == 1) - self.assertTrue(e.errors() == 1) + + e = cm.exception + self.assertEqual(1, e.errors(header.FormatError)) + self.assertEqual(1, e.errors()) def test_patch_mainline_never_detail(self): text = """ @@ -408,9 +392,9 @@ Acked-by: developer@suse.com self.header = header.Checker(text) except header.HeaderException as e: # Both policy and Git-commit require Patch-mainline - self.assertTrue(e.errors(header.MissingTagError) == 2) + self.assertEqual(2, e.errors(header.MissingTagError)) self.assertTrue(e.tag_is_missing('patch-mainline')) - self.assertTrue(e.errors() == 2) + self.assertEqual(2, e.errors()) def test_patch_mainline_queued_correct(self): text = """ @@ -432,14 +416,14 @@ Patch-mainline: Queued References: bsc#12345 Acked-by: developer@suse.com """ - try: + with self.assertRaises(header.HeaderException) as cm: self.header = header.Checker(text) - self.assertTrue(False) - except header.HeaderException as e: - self.assertTrue(e.errors(header.MissingTagError) == 2) - self.assertTrue(e.tag_is_missing('git-commit')) - self.assertTrue(e.tag_is_missing('git-repo')) - self.assertTrue(e.errors() == 2) + + e = cm.exception + self.assertEqual(2, e.errors(header.MissingTagError)) + self.assertTrue(e.tag_is_missing('git-commit')) + self.assertTrue(e.tag_is_missing('git-repo')) + self.assertEqual(2, e.errors()) def test_patch_mainline_queued_with_git_repo(self): text = """ @@ -450,15 +434,15 @@ Git-repo: git://path/to/git/repo References: bsc#12345 Acked-by: developer@suse.com """ - try: + with self.assertRaises(header.HeaderException) as cm: self.header = header.Checker(text) - self.assertTrue(False) - except header.HeaderException as e: - # Required by both Patch-mainline (Queued) and - # Git-repo - self.assertTrue(e.errors(header.MissingTagError) == 2) - self.assertTrue(e.tag_is_missing('git-commit')) - self.assertTrue(e.errors() == 2) + + e = cm.exception + # Required by both Patch-mainline (Queued) and + # Git-repo + self.assertEqual(2, e.errors(header.MissingTagError)) + self.assertTrue(e.tag_is_missing('git-commit')) + self.assertEqual(2, e.errors()) def test_patch_mainline_queued_with_git_commit(self): text = """ @@ -469,13 +453,13 @@ Git-commit: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa References: bsc#12345 Acked-by: developer@suse.com """ - try: + with self.assertRaises(header.HeaderException) as cm: self.header = header.Checker(text) - self.assertTrue(False) - except header.HeaderException as e: - self.assertTrue(e.errors(header.MissingTagError) == 1) - self.assertTrue(e.tag_is_missing('git-repo')) - self.assertTrue(e.errors() == 1) + + e = cm.exception + self.assertEqual(1, e.errors(header.MissingTagError)) + self.assertTrue(e.tag_is_missing('git-repo')) + self.assertEqual(1, e.errors()) def test_patch_mainline_invalid(self): text = """ @@ -485,12 +469,12 @@ Patch-mainline: n/a References: bsc#12345 Acked-by: developer@suse.com """ - try: + with self.assertRaises(header.HeaderException) as cm: self.header = header.Checker(text) - self.assertTrue(False) - except header.HeaderException as e: - self.assertTrue(e.errors(header.FormatError) == 1) - self.assertTrue(e.errors() == 1) + + e = cm.exception + self.assertEqual(1, e.errors(header.FormatError)) + self.assertEqual(1, e.errors()) def test_diff_like_description(self): text = """ @@ -531,14 +515,14 @@ Git-commit: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa References: Acked-by: developer@suse.com """ - try: + with self.assertRaises(header.HeaderException) as cm: self.header = header.Checker(text) - self.assertTrue(False) - except header.HeaderException as e: - self.assertTrue(e.errors(header.EmptyTagError) == 1) - self.assertTrue(e.errors(header.MissingTagError) == 1) - self.assertTrue(e.tag_is_missing('references')) - self.assertTrue(e.errors() == 2) + + e = cm.exception + self.assertEqual(1, e.errors(header.EmptyTagError)) + self.assertEqual(1, e.errors(header.MissingTagError)) + self.assertTrue(e.tag_is_missing('references')) + self.assertEqual(2, e.errors()) def test_patch_references_missing(self): text = """ @@ -548,13 +532,13 @@ Patch-mainline: v4.2-rc1 Git-commit: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa Acked-by: developer@suse.com """ - try: + with self.assertRaises(header.HeaderException) as cm: self.header = header.Checker(text) - self.assertTrue(False) - except header.HeaderException as e: - self.assertTrue(e.errors(header.MissingTagError) == 1) - self.assertTrue(e.tag_is_missing('references')) - self.assertTrue(e.errors() == 1) + + e = cm.exception + self.assertEqual(1, e.errors(header.MissingTagError)) + self.assertTrue(e.tag_is_missing('references')) + self.assertEqual(1, e.errors()) def test_patch_references_multi(self): text = """ @@ -604,24 +588,26 @@ Acked-by: developer@suse.com self.header = header.Checker(text) -# Enable this check when we want to require a real References tag -# def test_patch_references_only_freeform(self): -# text = """ -#From: developer@site.com -#Subject: some patch -#Patch-mainline: v4.2-rc1 -#Git-commit: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -#References: fix for blahblah -#Acked-by: developer@suse.com -#""" -# try: -# self.header = header.Checker(text) -# self.assertTrue(False) -# except header.HeaderException, e: -# self.assertTrue(e.errors(header.MissingTagError) == 1) -# self.assertTrue(e.tag_is_missing('references')) -# self.assertTrue(e.errors() == 1) -# + + @unittest.skip("Enable this check when we want to require a real " + "References tag") + def test_patch_references_only_freeform(self): + text = """ +From: developer@site.com +Subject: some patch +Patch-mainline: v4.2-rc1 +Git-commit: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +References: fix for blahblah +Acked-by: developer@suse.com +""" + with self.assertRaises(header.HeaderException) as cm: + self.header = header.Checker(text) + + e = cm.exception + self.assertEqual(1, e.errors(header.MissingTagError)) + self.assertTrue(e.tag_is_missing('references')) + self.assertEqual(1, e.errors()) + def test_patch_references_empty_update(self): text = """ @@ -632,12 +618,12 @@ Git-commit: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa References: Acked-by: developer@suse.com """ - try: + with self.assertRaises(header.HeaderException) as cm: self.header = header.Checker(text, True) - self.assertTrue(False) - except header.HeaderException as e: - self.assertTrue(e.errors(header.EmptyTagError) == 1) - self.assertTrue(e.errors() == 1) + + e = cm.exception + self.assertEqual(1, e.errors(header.EmptyTagError)) + self.assertEqual(1, e.errors()) def test_patch_references_missing_update(self): text = """ @@ -697,21 +683,21 @@ Acked-by: developer@suse.com self.header = header.Checker(text, True) -# Enable this check when we want to require a real References tag -# def test_patch_references_only_freeform_update(self): -# text = """ -#From: developer@site.com -#Subject: some patch -#Patch-mainline: v4.2-rc1 -#Git-commit: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -#References: fix for blahblah -#Acked-by: developer@suse.com -#""" -# try: -# self.header = header.Checker(text, True) -# self.assertTrue(False) -# except header.HeaderException, e: -# self.assertTrue(e.errors(header.MissingTagError) == 1) -# self.assertTrue(e.tag_is_missing('references')) -# self.assertTrue(e.errors() == 1) -# + @unittest.skip("Enable this check when we want to require a real " + "References tag") + def test_patch_references_only_freeform_update(self): + text = """ +From: developer@site.com +Subject: some patch +Patch-mainline: v4.2-rc1 +Git-commit: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +References: fix for blahblah +Acked-by: developer@suse.com +""" + with self.assertRaises(header.HeaderException) as cm: + self.header = header.Checker(text, True) + + e = cm.exception + self.assertEqual(1, e.errors(header.MissingTagError)) + self.assertTrue(e.tag_is_missing('references')) + self.assertEqual(1, e.errors()) diff --git a/scripts/tar-up.sh b/scripts/tar-up.sh index 90c3f3ab0a..9e5ece204b 100755 --- a/scripts/tar-up.sh +++ b/scripts/tar-up.sh @@ -195,8 +195,9 @@ CLEANFILES=() trap 'if test -n "$CLEANFILES"; then rm -rf "${CLEANFILES[@]}"; fi' EXIT tmpdir=$(mktemp -dt ${0##*/}.XXXXXX) CLEANFILES=("${CLEANFILES[@]}" "$tmpdir") +rpmfiles=$(ls rpm/* | grep -v "~$") -cp -p rpm/* config.conf supported.conf doc/* $build_dir +cp -p $rpmfiles config.conf supported.conf doc/* $build_dir match="${flavor:+\\/$flavor$}" match="${arch:+^+\\($(echo -n "${arch}" | sed 's/[, ]\+/\\\|/g')\\)\\>${match:+.*}}${match}" [ -n "$match" ] && sed -i "/^$\|\s*#\|${match}/b; s/\(.*\)/#### \1/" $build_dir/config.conf diff --git a/series.conf b/series.conf index fa237e1c31..66651b5ef5 100644 --- a/series.conf +++ b/series.conf @@ -148,6 +148,7 @@ # and patched flavors. ######################################################## patches.rpmify/lustre-lloop-dont-change-logical-size + patches.rpmify/powerpc-boot-Request-no-dynamic-linker-for-boot-wrap.patch ######################################################## # @@ -6482,7 +6483,6 @@ ######################################################## # powerpc/little endian ######################################################## - patches.rpmify/ppc64le-build-vmlinux.patch patches.arch/ppc64le-ile-0001-powerpc-Add-global-exports-for-all-interrupt-vectors.patch patches.arch/ppc64le-ile-0002-powerpc-Add-relocation-code-for-fixups.patch patches.arch/ppc64le-ile-0003-powerpc-Add-hack-to-make-ppc64le-work-on-hosts-witho.patch |