diff mbox series

package/refpolicy: move patch to version subdir for custom git support

Message ID 20240116085546.3624229-1-peter@korsgaard.com
State Accepted
Headers show
Series package/refpolicy: move patch to version subdir for custom git support | expand

Commit Message

Peter Korsgaard Jan. 16, 2024, 8:55 a.m. UTC 
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 <peter@korsgaard.com>
---
 ...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%)

Comments

Peter Korsgaard Jan. 26, 2024, 8:27 a.m. UTC | #1 
>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:

 > 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 <peter@korsgaard.com>

Committed, thanks.
Peter Korsgaard Feb. 28, 2024, 11:47 a.m. UTC | #2 
>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:

>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:
 >> 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 <peter@korsgaard.com>

 > Committed, thanks.

Committed to 2023.11.x, thanks.
diff mbox series

Patch

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