supermin (5.1.17-8) unstable; urgency=medium

  * Don't build init using musl on MIPS architectures due to toolchain
    breakage (Closes: #859656)

[dgit import unpatched supermin 5.1.17-8]

diff --cc debian/changelog
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..c9050e434957d58a70cf2d31955364d921747778
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/changelog
@@@ -1,0 -1,0 +1,492 @@@
++supermin (5.1.17-8) unstable; urgency=medium
++
++  * Don't build init using musl on MIPS architectures due to toolchain
++    breakage (Closes: #859656)
++
++ -- Hilko Bengen <bengen@debian.org>  Sat, 15 Apr 2017 17:21:10 +0200
++
++supermin (5.1.17-7) unstable; urgency=medium
++
++  * Introduce alternative kernel build-dependency (Closes: #851970)
++
++ -- Hilko Bengen <bengen@debian.org>  Sun, 22 Jan 2017 15:39:12 +0100
++
++supermin (5.1.17-6) unstable; urgency=medium
++
++  * Fix build dependency for determining Built-Using (Closes: #850974)
++  
++ -- Hilko Bengen <bengen@debian.org>  Wed, 11 Jan 2017 19:53:12 +0100
++
++supermin (5.1.17-5) unstable; urgency=medium
++
++  * Remove links from febootstrap package (Closes: #850635)
++  * Remove old NEWS, TODO items from debian/
++  * Tweak Built-Using in an attempt to fix FTBFS on alpha
++
++ -- Hilko Bengen <bengen@debian.org>  Mon, 09 Jan 2017 23:44:14 +0100
++
++supermin (5.1.17-4) unstable; urgency=medium
++
++  * Only disable PIE for the C-only static init program because doing
++    so altogether would break OCaml+C at least on amd64.
++
++ -- Hilko Bengen <bengen@debian.org>  Sat, 12 Nov 2016 15:35:41 +0100
++
++supermin (5.1.17-3) unstable; urgency=medium
++
++  * Add workaround for #843714 which caused FTBFS on some architectures
++
++ -- Hilko Bengen <bengen@debian.org>  Sat, 12 Nov 2016 15:14:50 +0100
++
++supermin (5.1.17-2) unstable; urgency=medium
++
++  * Use musl on mips64el
++  * Add patch so that we do not look for dpkg* in the wrong places
++
++ -- Hilko Bengen <bengen@debian.org>  Fri, 11 Nov 2016 10:08:26 +0100
++
++supermin (5.1.17-1) unstable; urgency=medium
++
++  * New upstream version 5.1.17
++  * Rebase patch
++
++ -- Hilko Bengen <bengen@debian.org>  Wed, 02 Nov 2016 09:05:34 +0100
++
++supermin (5.1.16-1) unstable; urgency=medium
++
++  * Imported Upstream version 5.1.16
++
++ -- Hilko Bengen <bengen@debian.org>  Thu, 28 Apr 2016 18:50:04 +0200
++
++supermin (5.1.15-3) unstable; urgency=medium
++
++  * Fix build on architectures without musl
++
++ -- Hilko Bengen <bengen@debian.org>  Thu, 18 Feb 2016 20:13:57 +0100
++
++supermin (5.1.15-2) unstable; urgency=medium
++
++  * Build init with musl where available
++
++ -- Hilko Bengen <bengen@debian.org>  Thu, 18 Feb 2016 18:34:28 +0100
++
++supermin (5.1.15-1) unstable; urgency=medium
++
++  * New upstream version
++  * Drop zlib, lzma dependencies
++  * Drop bin2s.pl-related patch
++
++ -- Hilko Bengen <bengen@debian.org>  Thu, 18 Feb 2016 01:43:33 +0100
++
++supermin (5.1.14-2) unstable; urgency=medium
++
++  * Apply upstream change to bin2s.pl
++
++ -- Hilko Bengen <bengen@debian.org>  Tue, 12 Jan 2016 21:31:42 +0100
++
++supermin (5.1.14-1) unstable; urgency=medium
++
++  * New upstream version
++  * Add support for alpha, hppa, powerpc64, sparc64 architectures
++
++ -- Hilko Bengen <bengen@debian.org>  Tue, 12 Jan 2016 08:02:46 +0100
++
++supermin (5.1.13-3) unstable; urgency=medium
++
++  * Put linux-image-586 to the front in the hope that sbuild's apt-based
++    resolver gets it right.
++
++ -- Hilko Bengen <bengen@debian.org>  Wed, 27 May 2015 23:19:28 +0200
++
++supermin (5.1.13-2) unstable; urgency=medium
++
++  * Added linux-image-586 to Build-Dependencies as linux-image-486 has
++    been removed from unstable
++
++ -- Hilko Bengen <bengen@debian.org>  Wed, 27 May 2015 20:47:05 +0200
++
++supermin (5.1.13-1) unstable; urgency=medium
++
++  * New upstream version
++
++ -- Hilko Bengen <bengen@debian.org>  Wed, 27 May 2015 08:38:24 +0200
++
++supermin (5.1.12-2) unstable; urgency=medium
++
++  * Fixed FTBFS on mips64el (Closes: #756467)
++
++ -- Hilko Bengen <bengen@debian.org>  Wed, 18 Mar 2015 23:01:10 +0100
++
++supermin (5.1.12-1) unstable; urgency=medium
++
++  * New upstream version
++
++ -- Hilko Bengen <bengen@debian.org>  Sun, 08 Mar 2015 10:49:43 +0100
++
++supermin (5.1.11-1) unstable; urgency=medium
++
++  * New upstream version
++  * Bumped Standards-Version
++
++ -- Hilko Bengen <bengen@debian.org>  Sun, 26 Oct 2014 10:41:59 +0100
++
++supermin (5.1.10-1) unstable; urgency=medium
++
++  * New upstream version
++
++ -- Hilko Bengen <bengen@debian.org>  Fri, 12 Sep 2014 22:35:45 +0200
++
++supermin (5.1.9-3) unstable; urgency=medium
++
++  * Corrected ppc64el kernel name
++
++ -- Hilko Bengen <bengen@debian.org>  Wed, 27 Aug 2014 23:57:57 +0200
++
++supermin (5.1.9-2) unstable; urgency=medium
++
++  * Added architecture-specific dependencies for arm64, ppc64el
++
++ -- Hilko Bengen <bengen@debian.org>  Wed, 27 Aug 2014 21:16:13 +0200
++
++supermin (5.1.9-1) unstable; urgency=medium
++
++  * New upstream version
++  * Dropped patch that was integrated upstream
++
++ -- Hilko Bengen <bengen@debian.org>  Tue, 22 Jul 2014 14:12:46 +0200
++
++supermin (5.1.8-2) unstable; urgency=medium
++
++  * skip test-execstack.sh
++
++ -- Hilko Bengen <bengen@debian.org>  Sat, 10 May 2014 13:14:52 +0200
++
++supermin (5.1.8-1) unstable; urgency=medium
++
++  * New upstream version
++  * Dropped patches integrated upstream
++
++ -- Hilko Bengen <bengen@debian.org>  Fri, 09 May 2014 23:22:41 +0200
++
++supermin (5.1.7-4) unstable; urgency=medium
++
++  * Added hppa assembler patch by Helge Deller (Closes: #742797)
++
++ -- Hilko Bengen <bengen@debian.org>  Fri, 09 May 2014 20:06:25 +0200
++
++supermin (5.1.7-3) unstable; urgency=medium
++
++  * Fixed internal error on short host_cpu names, added Debian-specific
++    dtb path.
++
++ -- Hilko Bengen <bengen@debian.org>  Mon, 28 Apr 2014 21:39:55 +0200
++
++supermin (5.1.7-2) unstable; urgency=medium
++
++  * Added patch to fix FTBFS on non-x86 platforms (Closes: #745724)
++
++ -- Hilko Bengen <bengen@debian.org>  Sat, 26 Apr 2014 22:25:05 +0200
++
++supermin (5.1.7-1) unstable; urgency=medium
++
++  * New upstream version
++
++ -- Hilko Bengen <bengen@debian.org>  Mon, 07 Apr 2014 09:00:10 +0200
++
++supermin (5.1.6-2) unstable; urgency=medium
++
++  * Upload to unstable
++
++ -- Hilko Bengen <bengen@debian.org>  Sat, 29 Mar 2014 11:34:22 +0100
++
++supermin (5.1.6-1) experimental; urgency=medium
++
++  * New upstream version
++  * Added more dependencies for running tests
++
++ -- Hilko Bengen <bengen@debian.org>  Thu, 27 Mar 2014 15:25:46 +0100
++
++supermin (5.1.5-1) experimental; urgency=medium
++
++  * New upstream version
++  * Improve package description
++
++ -- Hilko Bengen <bengen@debian.org>  Thu, 13 Mar 2014 23:38:39 +0100
++
++supermin (5.1.3-1) experimental; urgency=low
++
++  * New upstream version
++  * Cleared patch queue
++  * Updated dependencies, build-dependencies
++
++ -- Hilko Bengen <bengen@debian.org>  Thu, 06 Mar 2014 18:53:45 +0100
++
++supermin (5.1.2-2) experimental; urgency=low
++
++  * Added Breaks statement for "older" libguestfs versions
++  * Updated patch queue: Added multiarch fix
++
++ -- Hilko Bengen <bengen@debian.org>  Tue, 04 Mar 2014 21:46:49 +0100
++
++supermin (5.1.2-1) experimental; urgency=low
++
++  * New upstream version
++  * Fixed FTBFS on architectures without native OCaml compiler
++
++ -- Hilko Bengen <bengen@debian.org>  Mon, 03 Mar 2014 09:12:41 +0100
++
++supermin (5.1.1-1) experimental; urgency=low
++
++  * New upstream version
++  * Bumped Standards-Version, minor adjustments
++
++ -- Hilko Bengen <bengen@debian.org>  Sat, 01 Mar 2014 16:51:49 +0100
++
++supermin (4.1.6-1) unstable; urgency=low
++
++  * New upstream version
++
++ -- Hilko Bengen <bengen@debian.org>  Sun, 05 Jan 2014 18:06:16 +0100
++
++supermin (4.1.5-3) unstable; urgency=low
++
++  * Added Built-Using flag
++
++ -- Hilko Bengen <bengen@debian.org>  Wed, 23 Oct 2013 12:31:19 +0200
++
++supermin (4.1.5-2) unstable; urgency=low
++
++  * Added build-dependencies for gz, lzma support
++  * Updated TODO
++
++ -- Hilko Bengen <bengen@debian.org>  Thu, 10 Oct 2013 14:37:44 +0200
++
++supermin (4.1.5-1) unstable; urgency=low
++
++  * New upstream version
++  * Bumped Standards-Version
++
++ -- Hilko Bengen <bengen@debian.org>  Sun, 08 Sep 2013 21:40:42 +0200
++
++supermin (4.1.3-1) unstable; urgency=low
++
++  * New upstream version
++
++ -- Hilko Bengen <bengen@debian.org>  Fri, 23 Aug 2013 20:42:28 +0200
++
++supermin (4.1.2-1) unstable; urgency=low
++
++  * New upstream version
++  * Don't run tests that rely on network connectivity
++
++ -- Hilko Bengen <bengen@debian.org>  Sat, 03 Aug 2013 17:31:24 +0200
++
++supermin (4.1.1-3) unstable; urgency=low
++
++  * Updated (hopefully) all relevant files in debian/ to reflect the
++    febootstrap -> supermin name change (Closes: #707714)
++
++ -- Hilko Bengen <bengen@debian.org>  Sat, 11 May 2013 16:25:19 +0200
++
++supermin (4.1.1-2) unstable; urgency=low
++
++  * debian/control: Updated long description, removed DM-Upload-Allowed
++    header
++
++ -- Hilko Bengen <bengen@debian.org>  Sun, 28 Apr 2013 23:34:20 +0200
++
++supermin (4.1.1-1) unstable; urgency=low
++
++  * New renamed upstream version
++  * Introduced transitional package
++  * configure.ac patch is no longer needed
++
++ -- Hilko Bengen <bengen@debian.org>  Mon, 22 Apr 2013 21:52:31 +0200
++
++febootstrap (3.21-1) unstable; urgency=low
++
++  * New upstream version
++
++ -- Hilko Bengen <bengen@debian.org>  Fri, 04 Jan 2013 21:45:26 +0100
++
++febootstrap (3.20-1) unstable; urgency=low
++
++  * New upstream version
++
++ -- Hilko Bengen <bengen@debian.org>  Thu, 01 Nov 2012 13:52:31 +0100
++
++febootstrap (3.18-1) unstable; urgency=low
++
++  * New upstream version
++  * [a14cc5b] Removed autoreconf patch in favor of dh-autoreconf
++  * [c4c52a0] Rebased patch
++
++ -- Hilko Bengen <bengen@debian.org>  Tue, 17 Jul 2012 20:20:48 +0200
++
++febootstrap (3.17-1) unstable; urgency=low
++
++  * New upstream version
++  * [6944d1f] Switch to compat level 9 for hardening flags
++
++ -- Hilko Bengen <bengen@debian.org>  Fri, 15 Jun 2012 09:25:22 +0200
++
++febootstrap (3.15-1) unstable; urgency=low
++
++  * New upstream version
++  * [74d808a] Removed libext2fs-related patch that has been integrated
++    upstream
++  * [0a63302] Bumped Standards-Version
++
++ -- Hilko Bengen <bengen@debian.org>  Wed, 13 Jun 2012 18:33:36 +0200
++
++febootstrap (3.14-2) unstable; urgency=low
++
++  * [9df4595] Added upstream patch that fixes a libext2fs-related segfault
++
++ -- Hilko Bengen <bengen@debian.org>  Wed, 04 Apr 2012 20:31:29 +0200
++
++febootstrap (3.14-1) unstable; urgency=low
++
++  * New upstream version
++  * [b67dfe9] Rebased patch queue
++  * [fa7a9c1] Added pkg-config to Build-Depends
++
++ -- Hilko Bengen <bengen@debian.org>  Sat, 31 Mar 2012 14:38:11 +0200
++
++febootstrap (3.13-1) unstable; urgency=low
++
++  * New upstream version
++
++ -- Hilko Bengen <bengen@debian.org>  Mon, 13 Feb 2012 19:47:58 +0100
++
++febootstrap (3.12-2) unstable; urgency=low
++
++  * [6a9d6c8] Rebased patch queue, added workaround for duplicate entries
++    in package list produced by apt in Ubuntu 12.04
++
++ -- Hilko Bengen <bengen@debian.org>  Sun, 12 Feb 2012 18:15:30 +0100
++
++febootstrap (3.12-1) unstable; urgency=low
++
++  * New upstream version
++
++ -- Hilko Bengen <bengen@debian.org>  Wed, 19 Oct 2011 09:12:40 +0200
++
++febootstrap (3.11-1) unstable; urgency=low
++
++  * New upstream version
++
++ -- Hilko Bengen <bengen@debian.org>  Sat, 15 Oct 2011 09:04:08 +0200
++
++febootstrap (3.10-1) unstable; urgency=low
++
++  * New upstream version
++
++ -- Hilko Bengen <bengen@debian.org>  Fri, 02 Sep 2011 09:01:19 +0200
++
++febootstrap (3.9-1) unstable; urgency=low
++
++  * New upstream version
++  * [4c5e263] Removed portebility patches that have been accepted
++    upstream.
++
++ -- Hilko Bengen <bengen@debian.org>  Fri, 26 Aug 2011 19:44:37 +0200
++
++febootstrap (3.8-2) unstable; urgency=low
++
++  * [84f6849] Fixed two FTBFS issues (hopefully)
++
++ -- Hilko Bengen <bengen@debian.org>  Thu, 25 Aug 2011 18:56:02 +0200
++
++febootstrap (3.8-1) unstable; urgency=low
++
++  * New upstream version
++
++ -- Hilko Bengen <bengen@debian.org>  Tue, 23 Aug 2011 19:31:33 +0200
++
++febootstrap (3.7-2) unstable; urgency=low
++
++  * restrict architecture to linux-*
++
++ -- Hilko Bengen <bengen@debian.org>  Sun, 24 Jul 2011 18:28:29 +0200
++
++febootstrap (3.7-1) unstable; urgency=low
++
++  * New upstream version
++  * Removed two patches
++  * added architectures to helper/elf-default-arch, try to build on all
++    architectures.
++
++ -- Hilko Bengen <bengen@debian.org>  Sun, 24 Jul 2011 16:18:13 +0200
++
++febootstrap (3.6-2) unstable; urgency=low
++
++  * Passed the package to Pkg-libvirt Maintainers group
++  * Restricted architectures to the architectures for which the
++    autobuilders successfully built 3.6-1, added TODO items
++  * Added two patches from upstream git repository
++    - Translation of error conditions for the insmod routine
++    - new module loading order pre-calculation routine
++
++ -- Hilko Bengen <bengen@debian.org>  Wed, 29 Jun 2011 21:03:36 +0200
++
++febootstrap (3.6-1) unstable; urgency=low
++
++  * New upstream version.
++  * New maintainer.
++
++ -- Hilko Bengen <bengen@debian.org>  Tue, 28 Jun 2011 01:06:25 +0200
++
++febootstrap (2.7-0.1) unstable; urgency=low
++
++  * Non-maintainer upload - Acked by the maintainer.
++  * New upstream release.
++  * Switch to dpkg-source 3.0 (quilt) format.
++  * Update debian/control:
++    - move Build-Depends-Indep to Build-Depends.
++    - remove perl build dependency.
++    - bump Standards-Version from 3.8.1 to 3.8.4 (no changes needed).
++    - update Homepage field.
++    - switch from Architecture: all to any (supermin binaries).
++    - add required ${shlibs:Depends}.
++    - bump Depends versions.
++  * Switch debian/rules to dh usage.
++
++ -- Fathi Boudra <fabo@debian.org>  Thu, 17 Jun 2010 10:59:27 +0300
++
++febootstrap (2.1-4) unstable; urgency=low
++
++  * Change section and priority.
++  * Remove shlibs:Depends.
++  * Remove presubj.
++  * Remove dh_strip.
++  * Remove dh_installexamples.
++  * Remove other commented dh_* commands.
++  * Remove CVS files by passing -I & -i options to dpkg-buildpackage.
++  * Add debian/watch file.
++  * Use Build-Depends-Indep instead of Build-Depends.
++  * Change debian/copyright license information.
++
++ -- Richard Jones <rjones@redhat.com>  Mon, 01 Jun 2009 16:20:51 +0100
++
++febootstrap (2.1-3) unstable; urgency=low
++
++  * Added presubj for reportbug.
++  * Suggests filelight | gnome-utils.
++
++ -- Richard Jones <rjones@redhat.com>  Tue, 26 May 2009 15:04:01 +0100
++
++febootstrap (2.1-2) unstable; urgency=low
++
++  * Suggests upx -> upx-nrv.
++  * License Debian packaging under GPLv2+.
++  * Remove shlibdeps, CFLAGS, LIBS, cross-compilation from rules.
++  * Remove comments from debian/rules.
++
++ -- Richard Jones <rjones@redhat.com>  Mon, 25 May 2009 10:06:54 +0100
++
++febootstrap (2.1-1) unstable; urgency=low
++
++  * Initial release (Closes: #530425)
++
++ -- Richard Jones <rjones@redhat.com>  Sun, 24 May 2009 20:23:01 +0100

diff --cc debian/compat
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..ec635144f60048986bc560c5576355344005e6e7
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/compat
@@@ -1,0 -1,0 +1,1 @@@
++9

diff --cc debian/control
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..9e99f1ec16b28af6ffec7baecd7b78a6864271a2
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/control
@@@ -1,0 -1,0 +1,54 @@@
++Source: supermin
++Section: admin
++Priority: optional
++Maintainer: Debian Libvirt Maintainers <pkg-libvirt-maintainers@lists.alioth.debian.org>
++Uploaders: Hilko Bengen <bengen@debian.org>
++Build-Depends: debhelper (>= 9),
++ dh-autoreconf,
++ libc-dev-bin,
++ gawk, pkg-config,
++ apt,
++ ocaml-nox, ocaml-findlib, dh-ocaml,
++ perl,
++ comerr-dev, e2fslibs-dev,
++ cpio,
++ musl-tools [amd64 arm64 armel armhf i386],
++ augeas-tools, libhivex-bin, 
++ linux-image-alpha-generic [alpha],
++ linux-image-marvell [armel] | linux-image-versatile [armel],
++ linux-image-armmp [armhf],
++ linux-image-arm64 [arm64],
++ linux-image-4kc-malta [mips mipsel] | linux-image-5kc-malta [mips mipsel],
++ linux-image-5kc-malta [mips64 mips64el],
++ linux-image-s390x [s390x],
++ linux-image-parisc [hppa],
++ linux-image-powerpc [powerpc],
++ linux-image-powerpc64 [ppc64],
++ linux-image-powerpc64le [ppc64el],
++ linux-image-sparc64 [sparc sparc64],
++ linux-image-amd64 [amd64],
++ linux-image-586 [i386] | linux-image-486 [i386] | linux-image-686-pae [i386],
++Standards-Version: 3.9.6
++Homepage: http://people.redhat.com/~rjones/supermin/
++Vcs-Git: git://anonscm.debian.org/pkg-libvirt/supermin.git
++Vcs-Browser: http://anonscm.debian.org/?p=pkg-libvirt/supermin.git
++
++Package: supermin
++Architecture: linux-any
++Depends: ${shlibs:Depends}, ${misc:Depends},
++ apt, cpio,
++Breaks: libguestfs-tools (<< 1.25.38),
++Built-Using: ${misc:Built-Using}
++Description: tool for building supermin appliances.
++ Supermin appliances are tiny appliances, similar to virtual machine
++ images, usually around 100KB in size, which get fully instantiated
++ on-the-fly in a fraction of a second to a filesystem image when they
++ are booted.
++
++Package: febootstrap
++Architecture: all
++Section: oldlibs
++Priority: extra
++Depends: supermin (>= ${source:Version}), ${misc:Depends}
++Description: transitional package to deal with package renames.
++ The febootstrap tool was renamed to supermin.

diff --cc debian/copyright
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..e644531f60f7bc08142531e56d657d3f8eca0706
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/copyright
@@@ -1,0 -1,0 +1,44 @@@
++This work was packaged for Debian by:
++
++    Richard Jones <rjones@redhat.com> on Sun, 24 May 2009 20:23:01 +0100.
++
++It was downloaded from:
++
++    http://libguestfs.org/download/supermin/
++
++Upstream Authors:
++
++    Richard W.M. Jones <rjones@redhat.com>
++    Red Hat Inc.
++
++Copyright:
++
++    Copyright (C) 2009-2013 Red Hat Inc.
++
++License:
++
++    This package is free software; you can redistribute it and/or modify
++    it under the terms of the GNU General Public License as published by
++    the Free Software Foundation; either version 2 of the License, or
++    (at your option) any later version.
++
++    This package is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++    GNU General Public License for more details.
++
++    You should have received a copy of the GNU General Public License
++    along with this program. If not, see <http://www.gnu.org/licenses/>
++
++On Debian systems, the complete text of the GNU General
++Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
++
++The Debian packaging is:
++
++    Copyright (C) 2009-2010 Richard W.M. Jones <rjones@redhat.com>
++    Copyright (C) 2011-2013 Hilko Bengen <bengen@debian.org>
++
++you can redistribute it and/or modify
++it under the terms of the GNU General Public License as published by
++the Free Software Foundation; either version 2 of the License, or
++(at your option) any later version.

diff --cc debian/docs
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..e845566c06f9bf557d35e8292c37cf05d97a9769
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/docs
@@@ -1,0 -1,0 +1,1 @@@
++README

diff --cc debian/patches/0001-Add-hppa-hppa64-ppc64el-architectures.patch
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..1ee39adeba7bdf2cef9b0f31d847cfedc261b517
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/patches/0001-Add-hppa-hppa64-ppc64el-architectures.patch
@@@ -1,0 -1,0 +1,35 @@@
++From: Hilko Bengen <bengen@debian.org>
++Date: Wed, 27 Aug 2014 23:57:06 +0200
++Subject: Add hppa, hppa64, ppc64el architectures
++
++---
++ src/kernel.ml | 2 ++
++ src/utils.ml  | 2 ++
++ 2 files changed, 4 insertions(+)
++
++diff --git a/src/kernel.ml b/src/kernel.ml
++index 356ac4b..9b0e8a2 100644
++--- a/src/kernel.ml
+++++ b/src/kernel.ml
++@@ -30,6 +30,8 @@ let patt_of_cpu host_cpu =
++     | "ppc" | "powerpc" | "powerpc64" -> ["ppc"; "powerpc"; "powerpc64"]
++     | "sparc" | "sparc64" -> ["sparc"; "sparc64"]
++     | "amd64" | "x86_64" -> ["amd64"; "x86_64"]
+++    | "parisc" | "parisc64" -> ["hppa"; "hppa64"]
+++    | "ppc64el" -> ["powerpc64le"]
++     | _ when host_cpu.[0] = 'i' && host_cpu.[2] = '8' && host_cpu.[3] = '6' -> ["?86"]
++     | _ when String.length host_cpu >= 5 && String.sub host_cpu 0 5 = "armv7" ->  ["armmp"]
++     | _ -> [host_cpu]
++diff --git a/src/utils.ml b/src/utils.ml
++index 4223be4..e3b8742 100644
++--- a/src/utils.ml
+++++ b/src/utils.ml
++@@ -183,6 +183,8 @@ let compare_architecture a1 a2 =
++     | a when string_prefix "armv6" a -> 32
++     | a when string_prefix "armv7" a -> 32
++     | a when string_prefix "armv8" a -> 64
+++    | "hppa" | "parisc" -> 32
+++    | "hppa64" | "parisc64" -> 64
++     | "ppc" | "ppc32" -> 32
++     | a when string_prefix "ppc64" a -> 64
++     | "sparc" | "sparc32" -> 32

diff --cc debian/patches/0002-Look-for-dpkg-only-in-specified-usr-bin-bin.patch
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..4f1308be025f149fd443e9127810d5c7b2d32440
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/patches/0002-Look-for-dpkg-only-in-specified-usr-bin-bin.patch
@@@ -1,0 -1,0 +1,27 @@@
++From: Hilko Bengen <bengen@debian.org>
++Date: Fri, 11 Nov 2016 10:06:19 +0100
++Subject: Look for dpkg* only in specified /usr/bin, /bin
++
++---
++ configure.ac | 8 ++++----
++ 1 file changed, 4 insertions(+), 4 deletions(-)
++
++diff --git a/configure.ac b/configure.ac
++index 3a0d25d..72ffb92 100644
++--- a/configure.ac
+++++ b/configure.ac
++@@ -110,10 +110,10 @@ AC_PATH_PROG(URPMI,[urpmi],[no], [$PATH$PATH_SEPARATOR/usr/sbin])
++ 
++ dnl For Debian handler.
++ AC_PATH_PROG(APT_GET,[apt-get],[no])
++-AC_PATH_PROG(DPKG,[dpkg],[no])
++-AC_PATH_PROG(DPKG_DEB,[dpkg-deb],[no])
++-AC_PATH_PROG(DPKG_QUERY,[dpkg-query],[no])
++-AC_PATH_PROG(DPKG_DIVERT,[[dpkg-divert]],[no])
+++AC_PATH_PROG(DPKG,[dpkg],[no],[/usr/bin:/bin])
+++AC_PATH_PROG(DPKG_DEB,[dpkg-deb],[no],[/usr/bin:/bin])
+++AC_PATH_PROG(DPKG_QUERY,[dpkg-query],[no],[/usr/bin:/bin])
+++AC_PATH_PROG(DPKG_DIVERT,[[dpkg-divert]],[no],[/usr/bin:/bin])
++ 
++ dnl For FrugalWare handler (currently disabled).
++ AC_PATH_PROG(PACMAN_G2,[pacman-g2],[no])

diff --cc debian/patches/series
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..e3cbb8e5d4a3bb15b8d5af45b6494db987d89985
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,2 @@@
++0001-Add-hppa-hppa64-ppc64el-architectures.patch
++0002-Look-for-dpkg-only-in-specified-usr-bin-bin.patch

diff --cc debian/rules
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..87dae98c393653be502b263dc84a77f50774ff9f
new file mode 100755 (executable)
--- /dev/null
--- /dev/null
+++ b/debian/rules
@@@ -1,0 -1,0 +1,34 @@@
++#!/usr/bin/make -f
++
++# Uncomment this to turn on verbose mode.
++#export DH_VERBOSE=1
++
++
++override_dh_auto_configure:
++      dh_auto_configure -- --disable-network-tests $(cfgflags)
++
++override_dh_auto_build:
++      chmod a+x src/bin2s.pl
++
++      # Use musl-gcc where available. Otherwise work around #843714: GCC
++      # cannot build static binaries using the pie-specific spec files added
++      # by dpkg on (at least) powerpc, ppc64, sh4, sparc64.
++      if which musl-gcc >/dev/null; then \
++              dh_auto_build -- -C init CC=musl-gcc ; \
++      else \
++              eval $$(DEB_BUILD_MAINT_OPTIONS=hardening=-pie dpkg-buildflags --export=sh | grep '^export LDFLAGS') ; \
++              dh_auto_build -- -C init LDFLAGS=$$(LDFLAGS) ; \
++      fi
++      dh_auto_build
++
++override_dh_auto_test:
++      dh_auto_test -- SKIP_TEST_EXECSTACK=1
++
++override_dh_gencontrol:
++      dh_gencontrol -- -Vmisc:Built-Using="$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W $(if $(shell which musl-gcc),musl-tools,libc-dev-bin))"
++
++%:
++      dh $@ --with=ocaml,autoreconf
++
++override_dh_autoreconf:
++      AUTOMAKE='automake --foreign --add-missing' dh_autoreconf

diff --cc debian/source/format
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..163aaf8d82b6c54f23c45f32895dbdfdcc27b047
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/source/format
@@@ -1,0 -1,0 +1,1 @@@
++3.0 (quilt)

diff --cc debian/supermin.install
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..f7177e8d9fcbe1f7874b2a0fc06e4d6eac627775
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/supermin.install
@@@ -1,0 -1,0 +1,2 @@@
++usr/bin
++usr/share

diff --cc debian/supermin.lintian-overrides
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..987406f43bf24bcb2a3dc733f7a3a381d0f10d8e
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/supermin.lintian-overrides
@@@ -1,0 -1,0 +1,3 @@@
++# The library is part of a statically linked init program that is used
++# when starting the supermin appliance.
++supermin: embedded-library usr/bin/supermin: zlib

diff --cc debian/watch
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..09e571944ee885cd1c921daba0e4ee6572196182
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/watch
@@@ -1,0 -1,0 +1,2 @@@
++version=3
++http://libguestfs.org/download/supermin/ supermin-([\d\.]+)\.tar\.gz