Package: u-boot Version: 2014.10+dfsg1-2 Severity: serious Tags: patch Justification: FTBFS
Karsten Merker pointed out that u-boot FTBFS with newer versions of
patch in sid:
$ dpkg-source -x u-boot_2014.10+dfsg1-2.dsc
dpkg-source: info: extracting u-boot in u-boot-2014.10+dfsg1
dpkg-source: info: unpacking u-boot_2014.10+dfsg1.orig.tar.xz
dpkg-source: info: unpacking u-boot_2014.10+dfsg1-2.debian.tar.xz
dpkg-source: info: applying add-debian-revision-to-u-boot-version
...
patching file lib/hashtable.c
The next patch would create the file tools/logos/solidrun.bmp,
which already exists! Skipping patch.
dpkg-source: info: the patch has fuzz which is not allowed, or is malformed
dpkg-source: info: if patch 'cubox-i/cubox-i-support.diff' is correctly
applied by quilt, use 'quilt refresh' to update it
dpkg-source: info: restoring quilt backup files for
cubox-i/cubox-i-support.diff
dpkg-source: error: LC_ALL=C patch -t -F 0 -N -p1 -u -V never -g0 -E -b -B
.pc/cubox-i/cubox-i-support.diff/ --reject-file=- <
u-boot-2014.10+dfsg1/debian/patches/cubox-i/cubox-i-support.diff gave error
exit status 1
I also tested with u-boot 2014.10+dfsg1-2.1 from sid, and it had the
same issue.
Downgrading to patch 2.7.1-6 from jessie works around the issue and
builds fine.
The patch below also works around the issue and builds, by removing
solidrun.bmp, but I haven't yet tested if it causes issues on the
cubox-i:
commit c30f1c68b7af5a4ac7a09ce375e080d57b57ca44
Author: Vagrant Cascadian <vagr...@debian.org>
Date: Sun Feb 8 15:55:09 2015 -0800
cubox-i-support.diff: Refresh patch, dropping solidrun.bmp, which
causes FTBFS with patch 2.7.3-1 and newer.
diff --git a/debian/patches/cubox-i/cubox-i-support.diff
b/debian/patches/cubox-i/cubox-i-support.diff
index 24fa317..894e7f5 100644
--- a/debian/patches/cubox-i/cubox-i-support.diff
+++ b/debian/patches/cubox-i/cubox-i-support.diff
@@ -3290,7 +3290,3 @@ index 18ed590..8de0d58 100644
htab, htab->filled, htab->size,
rv, name, value);
} while ((dp < data + size) && *dp); /* size check needed for text */
-diff --git a/tools/logos/solidrun.bmp b/tools/logos/solidrun.bmp
-new file mode 100644
-index 0000000..93db1f8
-Binary files /dev/null and b/tools/logos/solidrun.bmp differ
live well,
vagrant
signature.asc
Description: PGP signature
