From cbea45787ae648b6bbebb79ec6fea7b82c3deab3 Mon Sep 17 00:00:00 2001 From: Hilko Bengen Date: Thu, 28 Apr 2016 16:50:04 +0000 Subject: [PATCH 1/1] Import supermin_5.1.16-1.debian.tar.xz [dgit import tarball supermin 5.1.16-1 supermin_5.1.16-1.debian.tar.xz] --- NEWS | 10 + TODO | 3 + changelog | 438 ++++++++++++++++++ compat | 1 + control | 53 +++ copyright | 44 ++ docs | 1 + febootstrap.links | 4 + ...dd-hppa-hppa64-ppc64el-architectures.patch | 35 ++ patches/series | 1 + rules | 24 + source/format | 1 + supermin.install | 2 + supermin.lintian-overrides | 3 + watch | 2 + 15 files changed, 622 insertions(+) create mode 100644 NEWS create mode 100644 TODO create mode 100644 changelog create mode 100644 compat create mode 100644 control create mode 100644 copyright create mode 100644 docs create mode 100644 febootstrap.links create mode 100644 patches/0001-Add-hppa-hppa64-ppc64el-architectures.patch create mode 100644 patches/series create mode 100755 rules create mode 100644 source/format create mode 100644 supermin.install create mode 100644 supermin.lintian-overrides create mode 100644 watch diff --git a/NEWS b/NEWS new file mode 100644 index 0000000..09e23f0 --- /dev/null +++ b/NEWS @@ -0,0 +1,10 @@ +febootstrap (3.6-1) unstable; urgency=low + + * febootstrap 3.x is a complete rewrite. febootstrap 2.x could only + build Fedora distributions. This version can build many varieties of + Linux distros. 3.x only builds supermin appliances, it does not build + chroots. 3.x does not build cross-distro, cross-release or + cross-architecture systems. + + -- Hilko Bengen Sun, 26 Jun 2011 19:37:04 +0200 + diff --git a/TODO b/TODO new file mode 100644 index 0000000..f3e173b --- /dev/null +++ b/TODO @@ -0,0 +1,3 @@ +- Figure out how to easily add "Built-Using" field (supermin init) +- (Possibly) figure out how to set up an initrd equivalent for + kfreebsd-*, hurd-* diff --git a/changelog b/changelog new file mode 100644 index 0000000..086d2b1 --- /dev/null +++ b/changelog @@ -0,0 +1,438 @@ +supermin (5.1.16-1) unstable; urgency=medium + + * Imported Upstream version 5.1.16 + + -- Hilko Bengen Thu, 28 Apr 2016 18:50:04 +0200 + +supermin (5.1.15-3) unstable; urgency=medium + + * Fix build on architectures without musl + + -- Hilko Bengen Thu, 18 Feb 2016 20:13:57 +0100 + +supermin (5.1.15-2) unstable; urgency=medium + + * Build init with musl where available + + -- Hilko Bengen 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 Thu, 18 Feb 2016 01:43:33 +0100 + +supermin (5.1.14-2) unstable; urgency=medium + + * Apply upstream change to bin2s.pl + + -- Hilko Bengen 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 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 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 Wed, 27 May 2015 20:47:05 +0200 + +supermin (5.1.13-1) unstable; urgency=medium + + * New upstream version + + -- Hilko Bengen Wed, 27 May 2015 08:38:24 +0200 + +supermin (5.1.12-2) unstable; urgency=medium + + * Fixed FTBFS on mips64el (Closes: #756467) + + -- Hilko Bengen Wed, 18 Mar 2015 23:01:10 +0100 + +supermin (5.1.12-1) unstable; urgency=medium + + * New upstream version + + -- Hilko Bengen Sun, 08 Mar 2015 10:49:43 +0100 + +supermin (5.1.11-1) unstable; urgency=medium + + * New upstream version + * Bumped Standards-Version + + -- Hilko Bengen Sun, 26 Oct 2014 10:41:59 +0100 + +supermin (5.1.10-1) unstable; urgency=medium + + * New upstream version + + -- Hilko Bengen Fri, 12 Sep 2014 22:35:45 +0200 + +supermin (5.1.9-3) unstable; urgency=medium + + * Corrected ppc64el kernel name + + -- Hilko Bengen 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 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 Tue, 22 Jul 2014 14:12:46 +0200 + +supermin (5.1.8-2) unstable; urgency=medium + + * skip test-execstack.sh + + -- Hilko Bengen 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 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 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 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 Sat, 26 Apr 2014 22:25:05 +0200 + +supermin (5.1.7-1) unstable; urgency=medium + + * New upstream version + + -- Hilko Bengen Mon, 07 Apr 2014 09:00:10 +0200 + +supermin (5.1.6-2) unstable; urgency=medium + + * Upload to unstable + + -- Hilko Bengen 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 Thu, 27 Mar 2014 15:25:46 +0100 + +supermin (5.1.5-1) experimental; urgency=medium + + * New upstream version + * Improve package description + + -- Hilko Bengen 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 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 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 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 Sat, 01 Mar 2014 16:51:49 +0100 + +supermin (4.1.6-1) unstable; urgency=low + + * New upstream version + + -- Hilko Bengen Sun, 05 Jan 2014 18:06:16 +0100 + +supermin (4.1.5-3) unstable; urgency=low + + * Added Built-Using flag + + -- Hilko Bengen 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 Thu, 10 Oct 2013 14:37:44 +0200 + +supermin (4.1.5-1) unstable; urgency=low + + * New upstream version + * Bumped Standards-Version + + -- Hilko Bengen Sun, 08 Sep 2013 21:40:42 +0200 + +supermin (4.1.3-1) unstable; urgency=low + + * New upstream version + + -- Hilko Bengen 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 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 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 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 Mon, 22 Apr 2013 21:52:31 +0200 + +febootstrap (3.21-1) unstable; urgency=low + + * New upstream version + + -- Hilko Bengen Fri, 04 Jan 2013 21:45:26 +0100 + +febootstrap (3.20-1) unstable; urgency=low + + * New upstream version + + -- Hilko Bengen 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 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 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 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 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 Sat, 31 Mar 2012 14:38:11 +0200 + +febootstrap (3.13-1) unstable; urgency=low + + * New upstream version + + -- Hilko Bengen 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 Sun, 12 Feb 2012 18:15:30 +0100 + +febootstrap (3.12-1) unstable; urgency=low + + * New upstream version + + -- Hilko Bengen Wed, 19 Oct 2011 09:12:40 +0200 + +febootstrap (3.11-1) unstable; urgency=low + + * New upstream version + + -- Hilko Bengen Sat, 15 Oct 2011 09:04:08 +0200 + +febootstrap (3.10-1) unstable; urgency=low + + * New upstream version + + -- Hilko Bengen 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 Fri, 26 Aug 2011 19:44:37 +0200 + +febootstrap (3.8-2) unstable; urgency=low + + * [84f6849] Fixed two FTBFS issues (hopefully) + + -- Hilko Bengen Thu, 25 Aug 2011 18:56:02 +0200 + +febootstrap (3.8-1) unstable; urgency=low + + * New upstream version + + -- Hilko Bengen Tue, 23 Aug 2011 19:31:33 +0200 + +febootstrap (3.7-2) unstable; urgency=low + + * restrict architecture to linux-* + + -- Hilko Bengen 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 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 Wed, 29 Jun 2011 21:03:36 +0200 + +febootstrap (3.6-1) unstable; urgency=low + + * New upstream version. + * New maintainer. + + -- Hilko Bengen 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 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 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 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 Mon, 25 May 2009 10:06:54 +0100 + +febootstrap (2.1-1) unstable; urgency=low + + * Initial release (Closes: #530425) + + -- Richard Jones Sun, 24 May 2009 20:23:01 +0100 diff --git a/compat b/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/compat @@ -0,0 +1 @@ +9 diff --git a/control b/control new file mode 100644 index 0000000..d4f1d4f --- /dev/null +++ b/control @@ -0,0 +1,53 @@ +Source: supermin +Section: admin +Priority: optional +Maintainer: Debian Libvirt Maintainers +Uploaders: Hilko Bengen +Build-Depends: debhelper (>= 9), + dh-autoreconf, + gawk, pkg-config, + apt, + ocaml-nox, ocaml-findlib, dh-ocaml, + perl, + comerr-dev, e2fslibs-dev, + cpio, + musl-tools [amd64 arm64 armel armhf i386 mips mipsel], + augeas-tools, libhivex-bin, + linux-image-alpha-generic [alpha], + 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 --git a/copyright b/copyright new file mode 100644 index 0000000..e644531 --- /dev/null +++ b/copyright @@ -0,0 +1,44 @@ +This work was packaged for Debian by: + + Richard Jones on Sun, 24 May 2009 20:23:01 +0100. + +It was downloaded from: + + http://libguestfs.org/download/supermin/ + +Upstream Authors: + + Richard W.M. Jones + 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 + +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 + Copyright (C) 2011-2013 Hilko Bengen + +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 --git a/docs b/docs new file mode 100644 index 0000000..e845566 --- /dev/null +++ b/docs @@ -0,0 +1 @@ +README diff --git a/febootstrap.links b/febootstrap.links new file mode 100644 index 0000000..06bb8f5 --- /dev/null +++ b/febootstrap.links @@ -0,0 +1,4 @@ +usr/share/man/man8/supermin-helper.8.gz usr/share/man/man8/febootstrap-supermin-helper.8.gz +usr/share/man/man8/supermin.8.gz usr/share/man/man8/febootstrap.8.gz +usr/bin/supermin usr/bin/febootstrap +usr/bin/supermin-helper usr/bin/febootstrap-supermin-helper diff --git a/patches/0001-Add-hppa-hppa64-ppc64el-architectures.patch b/patches/0001-Add-hppa-hppa64-ppc64el-architectures.patch new file mode 100644 index 0000000..ed51673 --- /dev/null +++ b/patches/0001-Add-hppa-hppa64-ppc64el-architectures.patch @@ -0,0 +1,35 @@ +From: Hilko Bengen +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 046cde9..9e090ac 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 7ae24bd..c81078d 100644 +--- a/src/utils.ml ++++ b/src/utils.ml +@@ -191,6 +191,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 --git a/patches/series b/patches/series new file mode 100644 index 0000000..a79a8d0 --- /dev/null +++ b/patches/series @@ -0,0 +1 @@ +0001-Add-hppa-hppa64-ppc64el-architectures.patch diff --git a/rules b/rules new file mode 100755 index 0000000..7ce20d6 --- /dev/null +++ b/rules @@ -0,0 +1,24 @@ +#!/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 + if which musl-gcc >/dev/null; then dh_auto_build -- -C init CC=musl-gcc; 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,libc6-dev))" + +%: + dh $@ --with=ocaml,autoreconf + +override_dh_autoreconf: + AUTOMAKE='automake --foreign --add-missing' dh_autoreconf diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/supermin.install b/supermin.install new file mode 100644 index 0000000..f7177e8 --- /dev/null +++ b/supermin.install @@ -0,0 +1,2 @@ +usr/bin +usr/share diff --git a/supermin.lintian-overrides b/supermin.lintian-overrides new file mode 100644 index 0000000..987406f --- /dev/null +++ b/supermin.lintian-overrides @@ -0,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 --git a/watch b/watch new file mode 100644 index 0000000..09e5719 --- /dev/null +++ b/watch @@ -0,0 +1,2 @@ +version=3 +http://libguestfs.org/download/supermin/ supermin-([\d\.]+)\.tar\.gz -- 2.30.2