From 0bb42e170d4247dc097df08b692a72b4410324c4 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 16 Jan 2024 09:55:46 +0100 Subject: [PATCH] package/refpolicy: move patch to version subdir for custom git support Commit e88823d667cf0 (package/refpolicy: fix build with smartmontools) added a 0001-policy-modules-services-smartmon.te-make-fstools-opt.patch patch, but forgot to put it in the version specific sub directory - Breaking builds using BR2_PACKAGE_REFPOLICY_CUSTOM_GIT as shown by the TestSELinuxCustomGit test: >>> refpolicy RELEASE_2_20200818 Extracting gzip -d -c /builds/buildroot.org/buildroot/test-dl/refpolicy/refpolicy-RELEASE_2_20200818-br1.tar.gz | tar --strip-components=1 -C /builds/buildroot.org/buildroot/test-output/TestSELinuxCustomGit/build/refpolicy-RELEASE_2_20200818 -xf - >>> refpolicy RELEASE_2_20200818 Patching Applying 0001-policy-modules-services-smartmon.te-make-fstools-opt.patch using patch: patching file policy/modules/services/smartmon.te Hunk #1 FAILED at 143. 1 out of 1 hunk FAILED -- saving rejects to file policy/modules/services/smartmon.te.rej make[1]: *** [package/pkg-generic.mk:241: /builds/buildroot.org/buildroot/test-output/TestSELinuxCustomGit/build/refpolicy-RELEASE_2_20200818/.stamp_patched] Error 1 https://gitlab.com/buildroot.org/buildroot/-/jobs/5929796183 Fix it by moving the patch to a versioned sub directory. Signed-off-by: Peter Korsgaard (cherry picked from commit bde468127c9d131de380d0dd2849527597ecf5e0) Signed-off-by: Peter Korsgaard --- ...001-policy-modules-services-smartmon.te-make-fstools-opt.patch | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename package/refpolicy/{ => 2.20231002}/0001-policy-modules-services-smartmon.te-make-fstools-opt.patch (100%) diff --git a/package/refpolicy/0001-policy-modules-services-smartmon.te-make-fstools-opt.patch b/package/refpolicy/2.20231002/0001-policy-modules-services-smartmon.te-make-fstools-opt.patch similarity index 100% rename from package/refpolicy/0001-policy-modules-services-smartmon.te-make-fstools-opt.patch rename to package/refpolicy/2.20231002/0001-policy-modules-services-smartmon.te-make-fstools-opt.patch