elementary / os-patches

Patched packages for elementary OS and the tools that keep them up-to-date
GNU General Public License v3.0
18 stars 11 forks source link

Reimport grub2_2.12-1ubuntu7 from packages.ubuntu.com #297

Closed ryonakano closed 2 months ago

ryonakano commented 2 months ago

This fixes the debuild of grub2 fails (and hopefully fixes the LP build failing; rebase grub2-noble-patched on grub2-noble after merging this branch)

user@VirtualBox-4c0cd87a:~/work/os-patches$ debuild -us -uc
:

dpkg-source: warning: diff os-patches/debian/patches/revert-term-ns8250-spcr.patch removes a non-existing file os-patches/grub-core/term/ns8250-spcr.c (line 59)
dpkg-source: info: applying revert-term-ns8250-spcr.patch
patching file docs/grub.texi
patching file grub-core/Makefile.core.def
The next patch would delete the file grub-core/term/ns8250-spcr.c,
which does not exist!  Skipping patch.
1 out of 1 hunk ignored
patching file grub-core/term/serial.c
patching file include/grub/serial.h
dpkg-source: info: the patch has fuzz which is not allowed, or is malformed
dpkg-source: info: if patch 'revert-term-ns8250-spcr.patch' is correctly applied by quilt, use 'quilt refresh' to update it
dpkg-source: info: if the file is present in the unpacked source, make sure it is also present in the orig tarball
dpkg-source: info: restoring quilt backup files for revert-term-ns8250-spcr.patch
dpkg-source: error: LC_ALL=C patch -t -F 0 -N -p1 -u -V never -E -b -B .pc/revert-term-ns8250-spcr.patch/ --reject-file=- < os-patches/debian/patches/revert-term-ns8250-spcr.patch subprocess returned exit status 1
dpkg-buildpackage: error: dpkg-source --before-build . subprocess returned exit status 2
debuild: fatal error at line 1184:
dpkg-buildpackage -us -uc -ui failed
user@VirtualBox-4c0cd87a:~/work/os-patches$
danirabbit commented 2 months ago

Rebased! Crossed fingers for build when the import runs in 30 minutes

ryonakano commented 2 months ago

@danirabbit Looks like we need to trigger build manually or switch to "Build daily" because it is set to "Build on request" at the moment:

https://code.launchpad.net/~elementary-os/+recipe/grub2-noble

danirabbit commented 2 months ago

Requested a build now!

ryonakano commented 2 months ago

Yay the build passed:

Screenshot from 2024-09-15 13-48-53

danirabbit commented 2 months ago

@ryonakano thank you so much for fixing it!