diff -Nru u-boot-2013.10/debian/changelog u-boot-2013.10/debian/changelog --- u-boot-2013.10/debian/changelog 2013-10-21 18:33:03.000000000 +0000 +++ u-boot-2013.10/debian/changelog 2013-11-17 08:09:41.000000000 +0000 @@ -1,3 +1,17 @@ +u-boot (2013.10-3) unstable; urgency=low + + * Move build of dbau1100 from mipsel to mips, which fixes FTBFS on mipsel, + due to dbau1100 being big-endian. + * Disable mipsel builds of u-boot, as it no longer has any targets. + * Add patch to specify default mmc partition to use when loading uEnv.txt + on BeagleBone Black. + * Add patch to support raw initrds on BeagleBone Black. + * Mark u-boot-tools as Multi-Arch: foreign. + * Mark u-boot as Multi-Arch: same. + * Update lintian overrides with list of current platforms. + + -- Vagrant Cascadian Sun, 17 Nov 2013 00:09:32 -0800 + u-boot (2013.10-2) unstable; urgency=low * debian/rules: diff -Nru u-boot-2013.10/debian/control u-boot-2013.10/debian/control --- u-boot-2013.10/debian/control 2013-10-20 18:00:43.000000000 +0000 +++ u-boot-2013.10/debian/control 2013-11-16 18:01:55.000000000 +0000 @@ -9,7 +9,8 @@ Vcs-Browser: http://git.debian.org/?p=collab-maint/u-boot.git;a=summary Package: u-boot -Architecture: armel armhf avr32 mips mipsel powerpc sh4 +Architecture: armel armhf avr32 mips powerpc sh4 +Multi-Arch: same Description: A boot loader for embedded systems Das U-Boot is a cross-platform bootloader for embedded systems, used as the default boot loader by several board vendors. It is @@ -19,6 +20,7 @@ Package: u-boot-tools Architecture: any +Multi-Arch: foreign Depends: ${shlibs:Depends} Breaks: uboot-envtools (<< 20081215-3~), uboot-mkimage (<= 0.4build1), diff -Nru u-boot-2013.10/debian/f u-boot-2013.10/debian/f --- u-boot-2013.10/debian/f 1970-01-01 00:00:00.000000000 +0000 +++ u-boot-2013.10/debian/f 2013-11-17 07:36:21.000000000 +0000 @@ -0,0 +1,8 @@ +debian/targets: Move build of dbau1100 from mipsel to mips, which fixes FTBFS on mipsel, due to dbau1100 being big-endian. +Disable mipsel builds of u-boot, as it no longer has any targets. +Add patch to support raw initrds on ti armv7 builds. +Add patch to specify default mmc partition to use when loading uEnv.txt. +Mark u-boot-tools as Multi-Arch: foreign. +Mark u-boot as Multi-Arch: same. +Update lintian overrides with list of current platforms. +Add lintian override for arch-dependent-file-not-in-arch-specific-directory: There are no file conflicts across architectures for u-boot, as each target is only installed on a single architecture. In theory, some targets could be built on multiple architectures, but could instead install the package for the architecture needed. diff -Nru u-boot-2013.10/debian/lintian.overrides u-boot-2013.10/debian/lintian.overrides --- u-boot-2013.10/debian/lintian.overrides 2013-10-20 18:00:43.000000000 +0000 +++ u-boot-2013.10/debian/lintian.overrides 2013-11-17 07:30:56.000000000 +0000 @@ -1,16 +1,50 @@ -u-boot: shared-lib-without-dependency-information ./usr/lib/u-boot/guruplug/uboot.elf -u-boot: shared-lib-without-dependency-information ./usr/lib/u-boot/sheevaplug/uboot.elf -u-boot: shared-lib-without-dependency-information ./usr/lib/u-boot/dreamplug/uboot.elf -u-boot: shared-lib-without-dependency-information ./usr/lib/u-boot/ZUMA/uboot.elf -u-boot: shared-lib-without-dependency-information ./usr/lib/u-boot/eNET/uboot.elf -u-boot: shared-lib-without-dependency-information ./usr/lib/u-boot/qemu_mips/uboot.elf -u-boot: shared-lib-without-dependency-information ./usr/lib/u-boot/dbau1100/uboot.elf -u-boot: shared-lib-without-dependency-information ./usr/lib/u-boot/hammerhead/uboot.elf -u-boot: shared-lib-without-dependency-information ./usr/lib/u-boot/sh7785lcr_32bit/uboot.elf -u-boot: shared-lib-without-dependency-information ./usr/lib/u-boot/r2dplus/uboot.elf -u-boot: shared-lib-without-dependency-information ./usr/lib/u-boot/efikamx/uboot.elf -u-boot: shared-lib-without-dependency-information ./usr/lib/u-boot/igep0020/uboot.elf -u-boot: shared-lib-without-dependency-information ./usr/lib/u-boot/mx53loco/uboot.elf -u-boot: shared-lib-without-dependency-information ./usr/lib/u-boot/omap3_beagle/uboot.elf -u-boot: shared-lib-without-dependency-information ./usr/lib/u-boot/omap4_panda/uboot.elf +# These are not really shared libraries, they're binary bootloaders. +u-boot: shared-lib-without-dependency-information usr/lib/u-boot/dockstar/uboot.elf +u-boot: shared-lib-without-dependency-information usr/lib/u-boot/dreamplug/uboot.elf +u-boot: shared-lib-without-dependency-information usr/lib/u-boot/guruplug/uboot.elf +u-boot: shared-lib-without-dependency-information usr/lib/u-boot/openrd_ultimate/uboot.elf +u-boot: shared-lib-without-dependency-information usr/lib/u-boot/sheevaplug/uboot.elf +u-boot: shared-lib-without-dependency-information usr/lib/u-boot/mx51_efikamx/uboot.elf +u-boot: shared-lib-without-dependency-information usr/lib/u-boot/mx51_efikasb/uboot.elf +u-boot: shared-lib-without-dependency-information usr/lib/u-boot/igep0020/uboot.elf +u-boot: shared-lib-without-dependency-information usr/lib/u-boot/omap3_beagle/uboot.elf +u-boot: shared-lib-without-dependency-information usr/lib/u-boot/omap4_panda/uboot.elf +u-boot: shared-lib-without-dependency-information usr/lib/u-boot/mx53loco/uboot.elf +u-boot: shared-lib-without-dependency-information usr/lib/u-boot/am335x_boneblack/uboot.elf +u-boot: shared-lib-without-dependency-information usr/lib/u-boot/wandboard_quad/uboot.elf +u-boot: shared-lib-without-dependency-information usr/lib/u-boot/wandboard_dl/uboot.elf +u-boot: shared-lib-without-dependency-information usr/lib/u-boot/wandboard_solo/uboot.elf +u-boot: shared-lib-without-dependency-information usr/lib/u-boot/hammerhead/uboot.elf +u-boot: shared-lib-without-dependency-information usr/lib/u-boot/dbau1100/uboot.elf +u-boot: shared-lib-without-dependency-information usr/lib/u-boot/qemu_mips/uboot.elf +u-boot: shared-lib-without-dependency-information usr/lib/u-boot/ZUMA/uboot.elf +u-boot: shared-lib-without-dependency-information usr/lib/u-boot/r2dplus/uboot.elf +u-boot: shared-lib-without-dependency-information usr/lib/u-boot/sh7785lcr_32bit/uboot.elf + +# There are no file conflicts across architectures for u-boot, as each +# target is only installed on a single architecture. In theory, some +# targets could be built on multiple architectures, but could instead install +# the package for the architecture needed. +u-boot: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/dockstar/uboot.elf +u-boot: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/dreamplug/uboot.elf +u-boot: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/guruplug/uboot.elf +u-boot: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/openrd_ultimate/uboot.elf +u-boot: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/sheevaplug/uboot.elf +u-boot: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/mx51_efikamx/uboot.elf +u-boot: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/mx51_efikasb/uboot.elf +u-boot: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/igep0020/uboot.elf +u-boot: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/omap3_beagle/uboot.elf +u-boot: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/omap4_panda/uboot.elf +u-boot: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/mx53loco/uboot.elf +u-boot: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/am335x_boneblack/uboot.elf +u-boot: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/wandboard_quad/uboot.elf +u-boot: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/wandboard_dl/uboot.elf +u-boot: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/wandboard_solo/uboot.elf +u-boot: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/hammerhead/uboot.elf +u-boot: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/dbau1100/uboot.elf +u-boot: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/qemu_mips/uboot.elf +u-boot: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/ZUMA/uboot.elf +u-boot: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/r2dplus/uboot.elf +u-boot: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/sh7785lcr_32bit/uboot.elf + u-boot: description-synopsis-starts-with-article diff -Nru u-boot-2013.10/debian/patches/am335x-uenv.txt.diff u-boot-2013.10/debian/patches/am335x-uenv.txt.diff --- u-boot-2013.10/debian/patches/am335x-uenv.txt.diff 1970-01-01 00:00:00.000000000 +0000 +++ u-boot-2013.10/debian/patches/am335x-uenv.txt.diff 2013-11-16 06:35:38.000000000 +0000 @@ -0,0 +1,25 @@ +Specify mmc partition to check for uEnv.txt rather than raw device. + +Based on patch by Robert Nelson + +Index: u-boot/include/configs/am335x_evm.h +=================================================================== +--- u-boot.orig/include/configs/am335x_evm.h 2013-10-26 08:39:53.000000000 -0700 ++++ u-boot/include/configs/am335x_evm.h 2013-10-28 16:53:36.476301322 -0700 +@@ -70,6 +70,7 @@ + "dfu_alt_info_mmc=" DFU_ALT_INFO_MMC "\0" \ + "dfu_alt_info_emmc=rawemmc mmc 0 3751936\0" \ + "mmcdev=0\0" \ ++ "mmcpart=1\0" \ + "mmcroot=/dev/mmcblk0p2 ro\0" \ + "mmcrootfstype=ext4 rootwait\0" \ + "rootpath=/export/rootfs\0" \ +@@ -97,7 +98,7 @@ + "nfsroot=${serverip}:${rootpath},${nfsopts} rw " \ + "ip=dhcp\0" \ + "bootenv=uEnv.txt\0" \ +- "loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ ++ "loadbootenv=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${bootenv}\0" \ + "importbootenv=echo Importing environment from mmc ...; " \ + "env import -t $loadaddr $filesize\0" \ + "dfu_alt_info_ram=" DFU_ALT_INFO_RAM "\0" \ diff -Nru u-boot-2013.10/debian/patches/series u-boot-2013.10/debian/patches/series --- u-boot-2013.10/debian/patches/series 2013-10-20 18:00:43.000000000 +0000 +++ u-boot-2013.10/debian/patches/series 2013-11-16 06:35:38.000000000 +0000 @@ -6,3 +6,5 @@ hurd.diff guruplug_mvfs_and_mmc.diff 0001-wandboard-uEnv.txt-bootz-n-fixes.patch +ti_armv7_common-support_raw_initrd.diff +am335x-uenv.txt.diff diff -Nru u-boot-2013.10/debian/patches/ti_armv7_common-support_raw_initrd.diff u-boot-2013.10/debian/patches/ti_armv7_common-support_raw_initrd.diff --- u-boot-2013.10/debian/patches/ti_armv7_common-support_raw_initrd.diff 1970-01-01 00:00:00.000000000 +0000 +++ u-boot-2013.10/debian/patches/ti_armv7_common-support_raw_initrd.diff 2013-10-29 08:46:43.000000000 +0000 @@ -0,0 +1,12 @@ +Index: u-boot/include/configs/ti_armv7_common.h +=================================================================== +--- u-boot.orig/include/configs/ti_armv7_common.h 2013-10-26 08:38:27.433333811 -0700 ++++ u-boot/include/configs/ti_armv7_common.h 2013-10-26 08:38:37.000000000 -0700 +@@ -149,6 +149,7 @@ + #define CONFIG_CMD_ASKENV + #define CONFIG_CMD_ECHO + #define CONFIG_CMD_BOOTZ ++#define CONFIG_SUPPORT_RAW_INITRD + + /* + * Common filesystems support. When we have removable storage we diff -Nru u-boot-2013.10/debian/rules u-boot-2013.10/debian/rules --- u-boot-2013.10/debian/rules 2013-10-21 18:24:14.000000000 +0000 +++ u-boot-2013.10/debian/rules 2013-11-17 02:19:07.000000000 +0000 @@ -14,7 +14,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), armel armhf avr32 mips mipsel powerpc sh4)) +ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), armel armhf avr32 mips powerpc sh4)) u_boot_package := true endif @@ -116,7 +116,7 @@ $(INSTALL_FILE) debian/lintian.overrides \ debian/$(package)/usr/share/lintian/overrides/$(package) - gzip -9f `find debian/$(package)/usr/share/doc -type f ! -name "copyright"` + gzip -9fn `find debian/$(package)/usr/share/doc -type f ! -name "copyright"` dpkg-gencontrol -ldebian/changelog -isp -p$(package) -Tdebian/$(package).substvars -Pdebian/$(package) cd debian/$(package) && find * -type f ! -regex '^DEBIAN/.*' -print0 | xargs -r0 md5sum > DEBIAN/md5sums diff -Nru u-boot-2013.10/debian/targets u-boot-2013.10/debian/targets --- u-boot-2013.10/debian/targets 2013-10-21 17:37:00.000000000 +0000 +++ u-boot-2013.10/debian/targets 2013-10-29 08:46:43.000000000 +0000 @@ -16,7 +16,7 @@ armhf wandboard_dl u-boot.imx armhf wandboard_solo u-boot.imx avr32 hammerhead u-boot.img -mipsel dbau1100 u-boot.img +mips dbau1100 u-boot.img mips qemu_mips u-boot.img powerpc ZUMA u-boot.img sh4 r2dplus u-boot.img