package/refpolicy: move patch to version subdir for custom git support
PATCH 1/1 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:
Quoted 1 line
Quoted 1 line
Quoted 1 line
refpolicy
RELEASE_2_20200818Extracting
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 -
Quoted 1 line
Quoted 1 line
Quoted 1 line
refpolicy
RELEASE_2_20200818Patching
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.
---
...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%)package/refpolicy/2.20231002/0001-policy-modules-services-smartmon.te-make-fstools-opt.patch renamed from package/refpolicy/0001-policy-modules-services-smartmon.te-make-fstools-opt.patch +0 -0
Signature · 6 lines
2.39.2 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 24 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Korsgaard <[email protected]> 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 usingBR2_PACKAGE_REFPOLICY_CUSTOM_GITas shown by the TestSELinuxCustomGit test:Quoted 1 line
Quoted 1 line
Quoted 1 line
refpolicy
RELEASE_2_20200818Extractinggzip -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 -
Quoted 1 line
Quoted 1 line
Quoted 1 line
refpolicy
RELEASE_2_20200818PatchingApplying 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
Quoted 5 lines
https://gitlab.com/buildroot.org/buildroot/-/jobs/5929796183
Fix it by moving the patch to a versioned sub directory.
Signed-off-by Peter Korsgaard <[email protected]>
Committed, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 25 lines
Quoted 24 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
"Peter" == Peter Korsgaard <[email protected]> writes:
"Peter" == Peter Korsgaard <[email protected]> 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 usingBR2_PACKAGE_REFPOLICY_CUSTOM_GITas shown by the TestSELinuxCustomGit test:Quoted 1 line
Quoted 1 line
Quoted 1 line
refpolicy
RELEASE_2_20200818Extractinggzip -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 -
Quoted 1 line
Quoted 1 line
Quoted 1 line
refpolicy
RELEASE_2_20200818PatchingApplying 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
Quoted 7 lines
Quoted 5 lines
https://gitlab.com/buildroot.org/buildroot/-/jobs/5929796183
Fix it by moving the patch to a versioned sub directory.
Signed-off-by Peter Korsgaard <[email protected]>Committed, thanks.
Committed to 2023.11.x, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot