diff -pruN 0.124/debian/changelog 0.124ubuntu1/debian/changelog --- 0.124/debian/changelog 2022-10-02 02:14:09.000000000 +0000 +++ 0.124ubuntu1/debian/changelog 2022-11-23 14:06:11.000000000 +0000 @@ -1,3 +1,21 @@ +libdebian-installer (0.124ubuntu1) lunar; urgency=medium + + * Merge from Debian unstable, remaining changes: + - Add more OMAP4 Panda support. + - Add OMAP4 Blaze support. + - Add Freescale "P4080 DS" and "QEMU e500" support. + - src/tree.c: Silence GCC's implicit-fallthrough warning by being explicit + in this binary tree rotate code that there's not fallthrough; we're + covering all tree rotation cases already (all paths in switch() already + return(). + - Allow to build without udeb packages. + * Dropped the following change in favour of explicitly disabling LTO: + - debian/rules: re-add the export CFLAGS call to fix build failures on + most architectures. + * Disable LTO to avoid FTBFS, see #1015482 + + -- Graham Inggs Wed, 23 Nov 2022 14:06:11 +0000 + libdebian-installer (0.124) unstable; urgency=high * Package parser: ignore multiarch qualifier suffix (Closes: #1020783). @@ -20,6 +38,27 @@ libdebian-installer (0.123) unstable; ur -- Holger Wansing Mon, 18 Jul 2022 14:39:10 +0200 +libdebian-installer (0.122ubuntu3) jammy; urgency=medium + + * debian/rules: re-add the export CFLAGS call to fix build failures on + most architectures. + + -- Łukasz 'sil2100' Zemczak Wed, 26 Jan 2022 12:16:44 +0100 + +libdebian-installer (0.122ubuntu1) jammy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Add more OMAP4 Panda support. + - Add OMAP4 Blaze support. + - Add Freescale "P4080 DS" and "QEMU e500" support. + - src/tree.c: Silence GCC's implicit-fallthrough warning by being explicit + in this binary tree rotate code that there's not fallthrough; we're + covering all tree rotation cases already (all paths in switch() already + return(). + - Allow to build without udeb packages. + + -- Łukasz 'sil2100' Zemczak Tue, 25 Jan 2022 13:40:47 +0100 + libdebian-installer (0.122) unstable; urgency=medium [ Samuel Thibault ] @@ -29,6 +68,18 @@ libdebian-installer (0.122) unstable; ur -- Cyril Brulebois Tue, 19 Oct 2021 13:55:29 +0200 +libdebian-installer (0.121ubuntu2) impish; urgency=medium + + * No-change rebuild to build packages with zstd compression. + + -- Matthias Klose Thu, 07 Oct 2021 12:14:53 +0200 + +libdebian-installer (0.121ubuntu1) impish; urgency=medium + + * Merge with Debian; remaining changes: + + -- Matthias Klose Mon, 10 May 2021 14:16:33 +0200 + libdebian-installer (0.121) unstable; urgency=medium [ Holger Wansing ] @@ -49,6 +100,31 @@ libdebian-installer (0.121) unstable; ur -- Steve McIntyre <93sam@debian.org> Sat, 30 Jan 2021 00:50:27 +0000 +libdebian-installer (0.120ubuntu3) hirsute; urgency=medium + + * Allow to build without udeb packages. + + -- Matthias Klose Tue, 23 Feb 2021 21:54:44 +0100 + +libdebian-installer (0.120ubuntu2) hirsute; urgency=medium + + * No-change rebuild to drop the udeb package. + + -- Matthias Klose Mon, 22 Feb 2021 10:34:26 +0100 + +libdebian-installer (0.120ubuntu1) hirsute; urgency=medium + + * Merge from Debian unstable. (LP: #1688246) Remaining changes: + - Add more OMAP4 Panda support. + - Add OMAP4 Blaze support. + - Add Freescale "P4080 DS" and "QEMU e500" support. + - src/tree.c: Silence GCC's implicit-fallthrough warning by being explicit + in this binary tree rotate code that there's not fallthrough; we're + covering all tree rotation cases already (all paths in switch() already + return(). + + -- Dimitri John Ledkov Mon, 02 Nov 2020 11:56:33 +0000 + libdebian-installer (0.120) unstable; urgency=medium * Team upload. @@ -145,6 +221,40 @@ libdebian-installer (0.111) unstable; ur -- Aurelien Jarno Sun, 25 Jun 2017 18:42:05 +0200 +libdebian-installer (0.110ubuntu4) groovy; urgency=medium + + * Fix FTBFS with GCC-10: Mark di_parser_fieldinfo constants extern. GCC-10 + changed the default from -fcommon to -fno-common which makes the gcc code + generator to emit globals without explicit initializers from .bss to .data. + + -- Lucas Kanashiro Mon, 03 Aug 2020 15:34:56 -0300 + +libdebian-installer (0.110ubuntu3) cosmic; urgency=medium + + * src/tree.c: Silence GCC's implicit-fallthrough warning by being explicit + in this binary tree rotate code that there's not fallthrough; we're + covering all tree rotation cases already (all paths in switch() already + return(). + + -- Mathieu Trudel-Lapierre Thu, 04 Oct 2018 14:29:03 -0400 + +libdebian-installer (0.110ubuntu2) bionic; urgency=medium + + * src/system/devfs.c: Include sys/sysmacros.h to fix FTBFS caused by + major/minor definition errors + + -- Julian Andres Klode Fri, 20 Apr 2018 15:23:06 +0200 + +libdebian-installer (0.110ubuntu1) artful; urgency=low + + * Merge from Debian unstable. (LP: #1688246) Remaining changes: + - Add more OMAP4 Panda support. + - Add OMAP4 Blaze support. + - Add Freescale "P4080 DS" and "QEMU e500" support. + - Point to Bazaar packaging repository on Launchpad + + -- Balint Reczey Thu, 18 May 2017 16:16:36 -0400 + libdebian-installer (0.110) unstable; urgency=medium [ Martin Michlmayr ] @@ -217,6 +327,31 @@ libdebian-installer (0.103) unstable; ur -- Christian Perrier Sat, 13 Feb 2016 15:17:19 +0100 +libdebian-installer (0.102ubuntu3) yakkety; urgency=medium + + * src/system/efi.c: fix my blunder; we still need to have ret declared as an + int since we need it for the ignore_uefi check. Derp. + + -- Mathieu Trudel-Lapierre Tue, 07 Jun 2016 13:24:57 -0400 + +libdebian-installer (0.102ubuntu2) yakkety; urgency=medium + + * src/system/efi.c: validate the presence of efivars *or* vars under + /sys/firmware/efi to decide whether we should show the system as running + in EFI mode; either of these paths is required for efibootmgr to set a + BootEntry at the end of installation. + + -- Mathieu Trudel-Lapierre Fri, 03 Jun 2016 21:24:31 -0400 + +libdebian-installer (0.102ubuntu1) xenial; urgency=medium + + * Resynchronise with Debian. Remaining changes: + - Add more OMAP4 Panda support. + - Add OMAP4 Blaze support. + - Add Freescale "P4080 DS" and "QEMU e500" support. + + -- Mathieu Trudel-Lapierre Wed, 23 Dec 2015 19:42:11 -0500 + libdebian-installer (0.102) unstable; urgency=medium [ Karsten Merker ] @@ -243,6 +378,30 @@ libdebian-installer (0.100) unstable; ur -- Christian Perrier Mon, 25 May 2015 07:59:28 +0200 +libdebian-installer (0.99ubuntu1) vivid; urgency=medium + + * Resynchronise with Debian. Remaining changes: + - Add Dove SoC subarchitecture. + - Add more OMAP4 Panda support. + - Add OMAP4 Blaze support. + - Add ArmadaXP support. + - Add Calxeda Highbank support. + - Add Freescale "P4080 DS" and "QEMU e500" support. + - Add Calxeda ECX-2000 support. (LP: #1196946) + - Add support for EXYNOS5440-based platforms (LP: #1231251) + - Add support for the WandBoard quad. + - Add support for keystone subarch + - Add support for HP ProLiant m800 Server Cartridge (keystone) + * The "generic" subarch is now returned for all unknown flavors, + so drop explicit matching for generic subarch hardware. + * Switch the Armada XP, EXYNOS5 and KeyStone2 to the "generic" subarch. + These platforms required special flavor kernel builds in previous + Ubuntu releases that are no longer provided. + * Drop support for Marvell DB-MV88F6781-BP Development Board. We + no longer support the "dove" subarch (Ref: partman-auto changelog). + + -- dann frazier Fri, 30 Jan 2015 16:12:58 -0700 + libdebian-installer (0.99) unstable; urgency=medium * Replace NULL terminator for the arm map_hardware table, accidentally @@ -338,6 +497,55 @@ libdebian-installer (0.89) unstable; urg -- dann frazier Mon, 23 Dec 2013 13:43:25 -0700 +libdebian-installer (0.88ubuntu6) utopic; urgency=medium + + * subarch-powerpc-linux.c: Pretend "PowerNV" is "chrp_ibm" for now. + + -- Adam Conrad Tue, 07 Oct 2014 17:46:52 -0600 + +libdebian-installer (0.88ubuntu5) trusty; urgency=medium + + * Add support for HP ProLiant m800 Server Cartridge (keystone) + + -- Manoj Iyer Thu, 19 Jun 2014 12:04:30 -0500 + +libdebian-installer (0.88ubuntu4) trusty; urgency=medium + + * Report the Calxeda ECX-2000 as generic-lpae, not generic, to match + base-installer which already has a different way to detect LPAE (thanks, + dann frazier; LP: #1293832). + + -- Colin Watson Thu, 20 Mar 2014 13:49:45 +0000 + +libdebian-installer (0.88ubuntu3) trusty; urgency=medium + + * Build for ppc64el. + + -- Colin Watson Mon, 27 Jan 2014 13:54:00 +0000 + +libdebian-installer (0.88ubuntu2) trusty; urgency=low + + * Add support for keystone subarch + + -- Michael Casadevall Thu, 02 Jan 2014 06:10:22 -0500 + +libdebian-installer (0.88ubuntu1) trusty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Appease the combination of _FORTIFY_SOURCE=2 (used by default on + Ubuntu) and -Werror. + - Add Dove SoC subarchitecture. + - Add more OMAP4 Panda support. + - Add OMAP4 Blaze support. + - Add ArmadaXP support. + - Add Calxeda Highbank support. + - Add Freescale "P4080 DS" and "QEMU e500" support. + - Add Calxedda ECX-2000 support. (LP: #1196946) + - Add support for EXYNOS5440-based platforms (LP: #1231251) + - Add support for the WandBoard quad. + + -- Stéphane Graber Thu, 14 Nov 2013 17:12:57 -0500 + libdebian-installer (0.88) unstable; urgency=low [ Colin Watson ] @@ -360,6 +568,44 @@ libdebian-installer (0.88) unstable; urg -- Christian Perrier Sun, 14 Jul 2013 13:18:37 +0200 +libdebian-installer (0.87ubuntu5) trusty; urgency=low + + * Add support for the WandBoard quad. + + -- Stéphane Graber Mon, 11 Nov 2013 17:04:01 -0500 + +libdebian-installer (0.87ubuntu4) saucy; urgency=low + + * Add support for EXYNOS5440-based platforms (LP: #1231251) + + -- dann frazier Thu, 03 Oct 2013 13:52:12 +0100 + +libdebian-installer (0.87ubuntu3) saucy; urgency=low + + * Change the Calxeda ECX-2000 suggested kernel to generic-lpae. + + -- Adam Conrad Tue, 10 Sep 2013 15:27:10 -0400 + +libdebian-installer (0.87ubuntu2) saucy; urgency=low + + * Add Calxedda ECX-2000 support. (LP: #1196946) + + -- Dmitrijs Ledkovs Wed, 21 Aug 2013 23:35:25 +0100 + +libdebian-installer (0.87ubuntu1) saucy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Appease the combination of _FORTIFY_SOURCE=2 (used by default on + Ubuntu) and -Werror. + - Add Dove SoC subarchitecture. + - Add more OMAP4 Panda support. + - Add OMAP4 Blaze support. + - Add ArmadaXP support. + - Add Calxeda Highbank support. + - Add Freescale "P4080 DS" and "QEMU e500" support. + + -- Colin Watson Sat, 25 May 2013 00:41:12 +0100 + libdebian-installer (0.87) unstable; urgency=low * Drop autotools-dev dh sequence (autoreconf already does what's needed @@ -377,6 +623,36 @@ libdebian-installer (0.86) unstable; urg -- Bastian Blank Sat, 06 Apr 2013 15:33:36 +0200 +libdebian-installer (0.85ubuntu3) raring; urgency=low + + * Switch to using the "generic" kernel flavor for Calxeda Highbank + * Update hardware map for Highbank to match the model string exposed by + /proc/device-tree/model since that takes precedence over /proc/cpuinfo + (LP: #1166595) + + -- dann frazier Thu, 11 Apr 2013 10:57:19 +0100 + +libdebian-installer (0.85ubuntu2) raring; urgency=low + + * Add platform detection of "P4080 DS" and "QEMU e500" to produce + "powerpc/fsl" for result. The "fsl" subarch can be expanded for other + Freescale platforms. I'll probably add a full list at some point. + + -- Ben Collins Thu, 17 Jan 2013 14:11:03 -0500 + +libdebian-installer (0.85ubuntu1) raring; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Appease the combination of _FORTIFY_SOURCE=2 (used by default on + Ubuntu) and -Werror. + - Add Dove SoC subarchitecture. + - Add more OMAP4 Panda support. + - Add OMAP4 Blaze support. + - Add ArmadaXP support. + - Add Calxeda Highbank support. + + -- Colin Watson Sun, 25 Nov 2012 15:00:07 +0000 + libdebian-installer (0.85) unstable; urgency=low * Add support for versatile express platform. @@ -435,6 +711,30 @@ libdebian-installer (0.80) unstable; urg -- Aurelien Jarno Mon, 02 Jan 2012 23:45:48 +0100 +libdebian-installer (0.79ubuntu3) quantal; urgency=low + + * Add support for Calxeda Highbank + + -- Michael Casadevall Wed, 16 May 2012 14:41:24 +0100 + +libdebian-installer (0.79ubuntu2) precise; urgency=low + + * Add support for ArmadaXP (LP: #934451) + + -- Michael Casadevall Wed, 22 Feb 2012 20:41:10 -0800 + +libdebian-installer (0.79ubuntu1) precise; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Appease the combination of _FORTIFY_SOURCE=2 (used by default on + Ubuntu) and -Werror. + - Add Dove SoC subarchitecture. + - Add the i386/efi and amd64/efi platforms. + - Add more OMAP4 Panda support. + - Add OMAP4 Blaze support. + + -- Colin Watson Mon, 17 Oct 2011 22:59:00 +0100 + libdebian-installer (0.79) unstable; urgency=low [ Hector Oron ] @@ -454,6 +754,18 @@ libdebian-installer (0.79) unstable; urg -- Otavio Salvador Wed, 27 Jul 2011 23:00:47 +0200 +libdebian-installer (0.78ubuntu1) oneiric; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Appease the combination of _FORTIFY_SOURCE=2 (used by default on + Ubuntu) and -Werror. + - Add Dove SoC subarchitecture. + - Add Beagle OMAP3 support. + - Add the i386/efi and amd64/efi platforms. + - Add OMAP4 Panda and Blaze support. + + -- Colin Watson Mon, 02 May 2011 09:04:49 +0100 + libdebian-installer (0.78) unstable; urgency=low [ Jeremie Koenig ] @@ -478,6 +790,24 @@ libdebian-installer (0.78) unstable; urg -- Hector Oron Tue, 22 Mar 2011 12:04:06 +0000 +libdebian-installer (0.77ubuntu2) natty; urgency=low + + * Map "OMAP4 Panda board" to armel/omap4 (LP: #744862). + + -- Colin Watson Sun, 10 Apr 2011 22:06:11 +0100 + +libdebian-installer (0.77ubuntu1) natty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Appease the combination of _FORTIFY_SOURCE=2 (used by default on + Ubuntu) and -Werror. + - Add Dove SoC subarchitecture. + - Add Beagle OMAP3 support. + - Add the i386/efi and amd64/efi platforms. + - Add OMAP4 Panda and Blaze support. + + -- Colin Watson Mon, 31 Jan 2011 18:54:33 +0000 + libdebian-installer (0.77) unstable; urgency=low [ Milan Kupcevic ] @@ -488,6 +818,25 @@ libdebian-installer (0.77) unstable; urg -- Otavio Salvador Fri, 24 Dec 2010 19:25:56 -0200 +libdebian-installer (0.76ubuntu2) maverick; urgency=low + + * add support for the OMAP4 Panda Board + * add support for the OMAP4 Blaze board + + -- Oliver Grawert Thu, 16 Sep 2010 14:13:02 +0200 + +libdebian-installer (0.76ubuntu1) maverick; urgency=low + + * Resynchronise with Debian, in order to get Michael's archdetect + heuristic work for Maverick. Remaining changes: + - Appease the combination of _FORTIFY_SOURCE=2 (used by default on + Ubuntu) and -Werror. + - Add Dove SoC subarchitecture. + - Add Beagle OMAP3 support. + - Add the i386/efi and amd64/efi platforms. + + -- Colin Watson Tue, 14 Sep 2010 17:59:37 +0100 + libdebian-installer (0.76) unstable; urgency=low [ Martin Michlmayr ] @@ -547,6 +896,22 @@ libdebian-installer (0.70) unstable; urg -- Aurelien Jarno Thu, 13 May 2010 12:19:18 +0200 +libdebian-installer (0.69ubuntu2) maverick; urgency=low + + * archdetect: Add the i386/efi and amd64/efi platforms. + + -- Colin Watson Thu, 10 Jun 2010 18:18:31 +0100 + +libdebian-installer (0.69ubuntu1) maverick; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Appease the combination of _FORTIFY_SOURCE=2 (used by default on + Ubuntu) and -Werror. + - Add Dove SoC subarchitecture. + - Add Beagle OMAP3 support. + + -- Colin Watson Thu, 06 May 2010 15:50:08 +0100 + libdebian-installer (0.69) unstable; urgency=low [ Frans Pop ] @@ -557,6 +922,27 @@ libdebian-installer (0.69) unstable; urg -- Martin Michlmayr Tue, 03 Nov 2009 18:11:44 +0000 +libdebian-installer (0.68ubuntu3) lucid; urgency=low + + * Reupload with the right autotools bits. + + -- Colin Watson Tue, 13 Apr 2010 13:00:20 +0100 + +libdebian-installer (0.68ubuntu2) lucid; urgency=low + + * add beagle OMAP3 support + + -- Oliver Grawert Tue, 13 Apr 2010 13:09:26 +0200 + +libdebian-installer (0.68ubuntu1) lucid; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Appease the combination of _FORTIFY_SOURCE=2 (used by default on + Ubuntu) and -Werror. + - Add Dove SoC subarchitecture. + + -- Colin Watson Mon, 02 Nov 2009 17:49:09 -0800 + libdebian-installer (0.68) unstable; urgency=low [ Martin Michlmayr ] @@ -607,6 +993,21 @@ libdebian-installer (0.64) unstable; urg -- Otavio Salvador Sat, 18 Jul 2009 11:06:19 -0300 +libdebian-installer (0.63ubuntu2) karmic; urgency=low + + [ Michael Casadevall ] + * Added Dove SoC subarchitecture (LP: #409238) + + -- Colin Watson Mon, 24 Aug 2009 12:26:17 +0100 + +libdebian-installer (0.63ubuntu1) karmic; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Appease the combination of _FORTIFY_SOURCE=2 (used by default on + Ubuntu) and -Werror. + + -- Colin Watson Thu, 25 Jun 2009 22:29:52 +0100 + libdebian-installer (0.63) unstable; urgency=low [ Michael Casadevall ] @@ -624,6 +1025,17 @@ libdebian-installer (0.63) unstable; urg -- Christian Perrier Sat, 13 Jun 2009 14:20:34 +0200 +libdebian-installer (0.62ubuntu1) karmic; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Appease the combination of _FORTIFY_SOURCE=2 (used by default on + Ubuntu) and -Werror. + - Add subarchitecture imx51 for Freescale iMX51 SoCs. + * Remove rather silly fwrite _FORTIFY_SOURCE workaround, since Ubuntu's + glibc no longer requires this. + + -- Colin Watson Tue, 28 Apr 2009 12:09:26 +0100 + libdebian-installer (0.62) unstable; urgency=low [ Martin Michlmayr ] @@ -632,6 +1044,21 @@ libdebian-installer (0.62) unstable; urg -- Martin Michlmayr Fri, 27 Mar 2009 18:03:49 +0100 +libdebian-installer (0.61ubuntu2) jaunty; urgency=low + + [ Michael Casadevall ] + * Added subarchitecture imx51 for Freescale iMX51 SoCs (LP: #345534). + + -- Colin Watson Fri, 27 Mar 2009 11:54:26 +0000 + +libdebian-installer (0.61ubuntu1) jaunty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Appease the combination of _FORTIFY_SOURCE=2 (used by default on + Ubuntu) and -Werror. + + -- Colin Watson Mon, 03 Nov 2008 13:41:45 +0000 + libdebian-installer (0.61) unstable; urgency=low [ Bastian Blank ] @@ -651,6 +1078,15 @@ libdebian-installer (0.60) unstable; urg -- Otavio Salvador Tue, 23 Sep 2008 21:36:38 -0300 +libdebian-installer (0.59ubuntu1) intrepid; urgency=low + + * Backport from trunk: + - Appease the combination of _FORTIFY_SOURCE=2 (used by default on + Ubuntu) and -Werror. Why exactly glibc demands that fwrite be checked + but not fputs is beyond me. + + -- Colin Watson Tue, 02 Sep 2008 13:07:03 +0100 + libdebian-installer (0.59) unstable; urgency=low * Apply patch to include 'Apple Inc.' as a possible vendor string for a @@ -1227,3 +1663,4 @@ libd-i (0.01) unstable; urgency=low * Initial Release. -- David Whedon Thu, 8 Feb 2001 21:54:45 -0800 + diff -pruN 0.124/debian/control 0.124ubuntu1/debian/control --- 0.124/debian/control 2022-03-31 20:25:41.000000000 +0000 +++ 0.124ubuntu1/debian/control 2022-11-23 11:54:40.000000000 +0000 @@ -1,7 +1,8 @@ Source: libdebian-installer Section: libs Priority: optional -Maintainer: Debian Install System Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Install System Team Uploaders: Bastian Blank , Colin Watson , Steve McIntyre <93sam@debian.org> Build-Depends: debhelper-compat (= 12), doxygen , pkg-config, check Standards-Version: 4.5.1 @@ -35,6 +36,7 @@ Description: Library of common debian-in Package: libdebian-installer4-udeb Package-Type: udeb +Build-Profiles: Section: debian-installer Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -56,6 +58,7 @@ Description: Library of some extra debia Package: libdebian-installer-extra4-udeb Package-Type: udeb +Build-Profiles: Section: debian-installer Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libdebian-installer4-udeb (= ${binary:Version}) diff -pruN 0.124/debian/rules 0.124ubuntu1/debian/rules --- 0.124/debian/rules 2021-10-19 11:55:02.000000000 +0000 +++ 0.124ubuntu1/debian/rules 2022-11-23 13:51:16.000000000 +0000 @@ -1,7 +1,15 @@ #! /usr/bin/make -f + +# Disable LTO to avoid FTBFS, see #1015482 +export DEB_BUILD_MAINT_OPTIONS=optimize=-lto + %: dh $@ --builddirectory=build +ifeq (,$(filter noudeb, $(DEB_BUILD_PROFILES))) + with_udeb = yes +endif + include /usr/share/dpkg/architecture.mk DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null) @@ -29,8 +37,10 @@ ifeq ($(filter nodoc,$(DEB_BUILD_OPTIONS endif override_dh_install: +ifeq ($(with_udeb),yes) install $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdebian-installer.so.4 $(CURDIR)/debian/libdebian-installer4-udeb/lib install $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdebian-installer-extra.so.4 $(CURDIR)/debian/libdebian-installer-extra4-udeb/lib +endif dh_install --sourcedir=debian/tmp ifeq ($(filter nodoc,$(DEB_BUILD_OPTIONS))$(filter nodoc,$(DEB_BUILD_PROFILES)),) dh_install -plibdebian-installer4-dev --sourcedir=debian/tmp usr/share/doc/libdebian-installer4-dev @@ -38,10 +48,10 @@ endif override_dh_makeshlibs: dh_makeshlibs -plibdebian-installer4 -V \ - --add-udeb=libdebian-installer4-udeb + $(if $(with_udeb),--add-udeb=libdebian-installer4-udeb) dh_makeshlibs -plibdebian-installer-extra4 -V \ - --add-udeb=libdebian-installer-extra4-udeb + $(if $(with_udeb),--add-udeb=libdebian-installer-extra4-udeb) override_dh_shlibdeps: dh_shlibdeps -N libdebian-installer-extra4 -N libdebian-installer-extra4-udeb - dh_shlibdeps -p libdebian-installer-extra4 -p libdebian-installer-extra4-udeb -- -L$(CURDIR)/debian/libdebian-installer-extra4.shlibs.local + dh_shlibdeps -p libdebian-installer-extra4 $(if $(with_udeb),-p libdebian-installer-extra4-udeb) -- -L$(CURDIR)/debian/libdebian-installer-extra4.shlibs.local diff -pruN 0.124/src/system/subarch-armel-linux.c 0.124ubuntu1/src/system/subarch-armel-linux.c --- 0.124/src/system/subarch-armel-linux.c 2021-02-08 12:52:58.000000000 +0000 +++ 0.124ubuntu1/src/system/subarch-armel-linux.c 2021-10-19 15:15:06.000000000 +0000 @@ -105,7 +105,9 @@ static struct map map_hardware[] = { { "Genesi Efika MX (Smarttop)", "mx5" }, { "Nokia RX-51 Board", "omap" }, { "OMAP3 Beagle Board", "omap" }, - { "OMAP4 Panda Board", "omap" }, + { "OMAP4 Panda Board", "omap4" }, + { "OMAP4430 Panda Board", "omap4" }, /* first OMAP4 hw platform, more to come */ + { "OMAP4430 4430SDP board", "omap4" }, /* OMAP4 blaze platform */ { "ARM-Versatile Express", "vexpress" }, { NULL, NULL } }; diff -pruN 0.124/src/system/subarch-armhf-linux.c 0.124ubuntu1/src/system/subarch-armhf-linux.c --- 0.124/src/system/subarch-armhf-linux.c 2021-02-08 12:52:58.000000000 +0000 +++ 0.124ubuntu1/src/system/subarch-armhf-linux.c 2021-10-19 15:15:06.000000000 +0000 @@ -105,7 +105,9 @@ static struct map map_hardware[] = { { "Genesi Efika MX (Smarttop)", "mx5" }, { "Nokia RX-51 Board", "omap" }, { "OMAP3 Beagle Board", "omap" }, - { "OMAP4 Panda Board", "omap" }, + { "OMAP4 Panda Board", "omap4" }, + { "OMAP4430 Panda Board", "omap4" }, /* first OMAP4 hw platform, more to come */ + { "OMAP4430 4430SDP board", "omap4" }, /* OMAP4 blaze platform */ { "ARM-Versatile Express", "vexpress" }, { NULL, NULL } }; diff -pruN 0.124/src/system/subarch-arm-linux.c 0.124ubuntu1/src/system/subarch-arm-linux.c --- 0.124/src/system/subarch-arm-linux.c 2021-02-08 12:52:58.000000000 +0000 +++ 0.124ubuntu1/src/system/subarch-arm-linux.c 2021-10-19 15:15:06.000000000 +0000 @@ -105,7 +105,9 @@ static struct map map_hardware[] = { { "Genesi Efika MX (Smarttop)", "mx5" }, { "Nokia RX-51 Board", "omap" }, { "OMAP3 Beagle Board", "omap" }, - { "OMAP4 Panda Board", "omap" }, + { "OMAP4 Panda Board", "omap4" }, + { "OMAP4430 Panda Board", "omap4" }, /* first OMAP4 hw platform, more to come */ + { "OMAP4430 4430SDP board", "omap4" }, /* OMAP4 blaze platform */ { "ARM-Versatile Express", "vexpress" }, { NULL, NULL } }; diff -pruN 0.124/src/system/subarch-powerpc-linux.c 0.124ubuntu1/src/system/subarch-powerpc-linux.c --- 0.124/src/system/subarch-powerpc-linux.c 2021-02-08 12:52:58.000000000 +0000 +++ 0.124ubuntu1/src/system/subarch-powerpc-linux.c 2021-10-19 15:15:07.000000000 +0000 @@ -36,6 +36,8 @@ static struct map map_platform[] = { { "Maple", "chrp_ibm" }, { "pSeries", "chrp_ibm" }, { "PowerNV", "chrp_ibm" }, + { "P4080 DS", "fsl" }, + { "QEMU e500", "fsl" }, { NULL, NULL } }; diff -pruN 0.124/src/system/subarch-ppc64el-linux.c 0.124ubuntu1/src/system/subarch-ppc64el-linux.c --- 0.124/src/system/subarch-ppc64el-linux.c 2021-02-08 12:52:58.000000000 +0000 +++ 0.124ubuntu1/src/system/subarch-ppc64el-linux.c 2021-10-19 15:15:07.000000000 +0000 @@ -36,6 +36,8 @@ static struct map map_platform[] = { { "Maple", "chrp_ibm" }, { "pSeries", "chrp_ibm" }, { "PowerNV", "chrp_ibm" }, + { "P4080 DS", "fsl" }, + { "QEMU e500", "fsl" }, { NULL, NULL } }; diff -pruN 0.124/src/system/subarch-ppc64-linux.c 0.124ubuntu1/src/system/subarch-ppc64-linux.c --- 0.124/src/system/subarch-ppc64-linux.c 2021-02-08 12:52:58.000000000 +0000 +++ 0.124ubuntu1/src/system/subarch-ppc64-linux.c 2021-10-19 15:15:07.000000000 +0000 @@ -36,6 +36,8 @@ static struct map map_platform[] = { { "Maple", "chrp_ibm" }, { "pSeries", "chrp_ibm" }, { "PowerNV", "chrp_ibm" }, + { "P4080 DS", "fsl" }, + { "QEMU e500", "fsl" }, { NULL, NULL } }; diff -pruN 0.124/src/tree.c 0.124ubuntu1/src/tree.c --- 0.124/src/tree.c 2021-02-08 12:52:58.000000000 +0000 +++ 0.124ubuntu1/src/tree.c 2021-10-19 15:15:06.000000000 +0000 @@ -198,6 +198,7 @@ static di_tree_node *di_tree_node_rotate case 1: return di_tree_node_rotate_right_double (node); } + break; case -1: case 0: case 1: