Skip to content

Wip/ritesh/update linux 41998

Merge linux changes from Debian Buster.

Also refreshed the patches through quilt:

  • Because gbp pq import/rebase was failing
  • dpkg-source did not allow to proceed with fuzz
rrs@priyasi:~/rrs-home/devel/CCU/Gitlab_Packages/target/linux (wip/ritesh/update-linux-41998)$ gbp pq import
gbp:info: Trying to apply patches at 'a5233fc12fb359705b1fb8d4b71d106a14b94763'
gbp:warning: Patch 0001-apparmor-patch-to-provide-compatibility-with-v2.x-ne.patch failed to apply, retrying with whitespace fixup
gbp:error: Failed to apply '/home/rrs/NoBackup/Gitlab_Packages/target/linux/debian/patches/apparmor/0001-apparmor-patch-to-provide-compatibility-with-v2.x-ne.patch': Error running git apply: error: patch failed: security/apparmor/policy_unpack.c:292
error: security/apparmor/policy_unpack.c: patch does not apply
gbp:error: Couldn't apply patches
14:07 ♒ ॐ   ☹ 😟=> 1  
rrs@priyasi:~/rrs-home/devel/CCU/Gitlab_Packages/target/linux (wip/ritesh/update-linux-41998)$ gbp pq rebase
gbp:info: No pq branch found, importing patches
gbp:info: Trying to apply patches at 'a5233fc12fb359705b1fb8d4b71d106a14b94763'
gbp:warning: Patch 0001-apparmor-patch-to-provide-compatibility-with-v2.x-ne.patch failed to apply, retrying with whitespace fixup
gbp:error: Failed to apply '/home/rrs/NoBackup/Gitlab_Packages/target/linux/debian/patches/apparmor/0001-apparmor-patch-to-provide-compatibility-with-v2.x-ne.patch': Error running git apply: error: patch failed: security/apparmor/policy_unpack.c:292
error: security/apparmor/policy_unpack.c: patch does not apply
gbp:error: Couldn't apply patches
14:09 ♒ ॐ   ☹ 😟=> 1  
Stage: build
Name: build-source
Trace: dpkg-source: info: applying debian/ntfs-mark-it-as-broken.patch
dpkg-source: info: applying bugfix/all/libertas-fix-two-buffer-overflows-at-parsing-bss-descriptor.patch
dpkg-source: info: applying bugfix/all/wimax-i2400-fix-memory-leak.patch
dpkg-source: info: applying bugfix/all/wimax-i2400-fix-memory-leak-in-i2400m_op_rfkill_sw_toggle.patch
dpkg-source: info: applying bugfix/all/random-try-to-actively-add-entropy-rather-than-passi.patch
dpkg-source: info: applying apparmor/0001-apparmor-patch-to-provide-compatibility-with-v2.x-ne.patch
patching file security/apparmor/apparmorfs.c
Hunk #1 succeeded at 2275 (offset 3 lines).
patching file security/apparmor/include/apparmor.h
patching file security/apparmor/include/net.h
patching file security/apparmor/include/policy.h
patching file security/apparmor/net.c
patching file security/apparmor/policy.c
patching file security/apparmor/policy_unpack.c
Hunk #2 FAILED at 292.
Hunk #3 succeeded at 615 (offset -6 lines).
Hunk #4 succeeded at 753 (offset -6 lines).
1 out of 4 hunks FAILED
dpkg-source: info: the patch has fuzz which is not allowed, or is malformed
dpkg-source: info: if patch 'apparmor/0001-apparmor-patch-to-provide-compatibility-with-v2.x-ne.patch' is correctly applied by quilt, use 'quilt refresh' to update it
dpkg-source: info: restoring quilt backup files for apparmor/0001-apparmor-patch-to-provide-compatibility-with-v2.x-ne.patch
dpkg-source: error: LC_ALL=C patch -t -F 0 -N -p1 -u -V never -E -b -B .pc/apparmor/0001-apparmor-patch-to-provide-compatibility-with-v2.x-ne.patch/ --reject-file=- < linux-4.19.98/debian/patches/apparmor/0001-apparmor-patch-to-provide-compatibility-with-v2.x-ne.patch subprocess returned exit status 1
dpkg-buildpackage: error: dpkg-source -i -I --before-build . subprocess returned exit status 2
debuild: fatal error at line 1182:
dpkg-buildpackage -us -uc -ui -i -I -S failed
gbp:error: 'debuild -i -I -uc -us -S' failed: it exited with 29
Edited by Ritesh Raj Sarraf

Merge request reports