[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#776928: unblock: debian-installer-netboot-images/20150107



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
x-debbugs-cc: debian-boot@lists.debian.org

Hi,

please unblock debian-installer-netboot-images/201501078 as the version
currently in testing is unusable with jessie.

$ debdiff debian-installer-netboot-images_20130613+deb7u2.b4.dsc debian-installer-netboot-images_20150107.dsc|diffstat
 debian/README               |    2 -
 debian/changelog            |   54 +++++++++-----------------------------------
 debian/compat               |    2 -
 debian/control              |   48 +++++++++++++++++++--------------------
 debian/control.in           |    2 -
 debian/lintian-overrides.in |    5 ++++
 debian/rules                |    9 ++++---
 get-images.sh               |   17 ++++++++-----
 8 files changed, 60 insertions(+), 79 deletions(-)

debian-installer-netboot-images (20150107) unstable; urgency=low

  * Update to 20150107 images.

  [ Dmitrijs Ledkovs ]
  * Bump debhelper compat level to 9.

  [ Didier Raboud ]
  * Update architectures' list, distribution codename and major version
    for Jessie (Closes: #766960)
  * Add a kfreebsd netboot directory postfix special-case
  * Add new matching lintian overrides
  * Move to one-digit versioning, aka from '-7.0-' to '-8-'

  [ Cyril Brulebois ]
  * Update README to document fancy .bN suffix for d-i-n-i when d-i has
    +bN.
  * Add a check in get-images.sh to detect wrong binNMU versioning.

 -- Didier Raboud <odyx@debian.org>  Thu, 29 Jan 2015 10:34:48 +0100


Full diff attached for your convinience...


cheers,
	Holger
diff -Nru debian-installer-netboot-images-20130613+deb7u2.b4/debian/changelog debian-installer-netboot-images-20150107/debian/changelog
--- debian-installer-netboot-images-20130613+deb7u2.b4/debian/changelog	2015-01-05 23:59:30.000000000 +0100
+++ debian-installer-netboot-images-20150107/debian/changelog	2015-01-29 10:35:32.000000000 +0100
@@ -1,53 +1,23 @@
-debian-installer-netboot-images (20130613+deb7u2.b4) wheezy; urgency=low
+debian-installer-netboot-images (20150107) unstable; urgency=low
 
-  * Update to 20130613+deb7u2+b4 images, from proposed-updates.
+  * Update to 20150107 images.
 
- -- Adam D. Barratt <adam@adam-barratt.org.uk>  Mon, 05 Jan 2015 21:23:44 +0000
+  [ Dmitrijs Ledkovs ]
+  * Bump debhelper compat level to 9.
 
-debian-installer-netboot-images (20130613+deb7u2.b3) wheezy; urgency=low
+  [ Didier Raboud ]
+  * Update architectures' list, distribution codename and major version
+    for Jessie (Closes: #766960)
+  * Add a kfreebsd netboot directory postfix special-case
+  * Add new matching lintian overrides
+  * Move to one-digit versioning, aka from '-7.0-' to '-8-'
 
-  * Update to 20130613+deb7u2+b3 images, from proposed-updates.
-
- -- Adam D. Barratt <adam@adam-barratt.org.uk>  Mon, 13 Oct 2014 20:08:24 +0100
-
-debian-installer-netboot-images (20130613+deb7u2.b2) wheezy; urgency=low
-
-  * Update to 20130613+deb7u2+b2 images, from proposed-updates.
-
- -- Adam D. Barratt <adam@adam-barratt.org.uk>  Thu, 10 Jul 2014 05:44:50 +0100
-
-debian-installer-netboot-images (20130613+deb7u2.b1) wheezy; urgency=low
-
-  * Update to 20130613+deb7u2+b1 images, from proposed-updates.
-
- -- Adam D. Barratt <adam@adam-barratt.org.uk>  Thu, 24 Apr 2014 19:17:24 +0100
-
-debian-installer-netboot-images (20130613+deb7u1.b2) wheezy; urgency=low
-
-  * Update to 20130613+deb7u1+b2 images, from proposed-updates.
-
- -- Adam D. Barratt <adam@adam-barratt.org.uk>  Wed, 05 Feb 2014 20:24:42 +0000
-
-debian-installer-netboot-images (20130613+deb7u1.b1) wheezy; urgency=low
-
-  * Update to 20130613+deb7u1+b1 images, from proposed-updates.
-
- -- Adam D. Barratt <adam@adam-barratt.org.uk>  Thu, 12 Dec 2013 19:03:39 +0000
-
-debian-installer-netboot-images (20130613+deb7u1) wheezy; urgency=low
-
-  * Update to 20130613+deb7u1 images, from wheezy-proposed-updates.
+  [ Cyril Brulebois ]
   * Update README to document fancy .bN suffix for d-i-n-i when d-i has
     +bN.
   * Add a check in get-images.sh to detect wrong binNMU versioning.
 
- -- Cyril Brulebois <kibi@debian.org>  Fri, 11 Oct 2013 01:10:36 +0200
-
-debian-installer-netboot-images (20130613) wheezy; urgency=low
-
-  * Update to 20130613 images, from wheezy-proposed-updates.
-
- -- Cyril Brulebois <kibi@debian.org>  Fri, 14 Jun 2013 11:48:42 +0200
+ -- Didier Raboud <odyx@debian.org>  Thu, 29 Jan 2015 10:34:48 +0100
 
 debian-installer-netboot-images (20130430) unstable; urgency=low
 
diff -Nru debian-installer-netboot-images-20130613+deb7u2.b4/debian/compat debian-installer-netboot-images-20150107/debian/compat
--- debian-installer-netboot-images-20130613+deb7u2.b4/debian/compat	2014-07-09 23:31:41.000000000 +0200
+++ debian-installer-netboot-images-20150107/debian/compat	2014-08-28 20:29:50.000000000 +0200
@@ -1 +1 @@
-7
+9
diff -Nru debian-installer-netboot-images-20130613+deb7u2.b4/debian/control debian-installer-netboot-images-20150107/debian/control
--- debian-installer-netboot-images-20130613+deb7u2.b4/debian/control	2014-10-13 20:01:17.000000000 +0200
+++ debian-installer-netboot-images-20150107/debian/control	2015-01-29 10:35:51.000000000 +0100
@@ -9,7 +9,7 @@
 Priority: optional
 Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
 Uploaders: Otavio Salvador <otavio@debian.org>, Didier Raboud <odyx@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), wget,
+Build-Depends: debhelper (>= 9), wget,
  debian-archive-keyring,
  gpgv,
  dctrl-tools
@@ -17,7 +17,7 @@
 Vcs-Git: git://anonscm.debian.org/d-i/debian-installer-netboot-images.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=d-i/debian-installer-netboot-images.git;a=summary
 
-Package: debian-installer-7.0-netboot-amd64
+Package: debian-installer-8-netboot-amd64
 Architecture: all
 Depends: ${misc:Depends}
 Provides: debian-installer-netboot-amd64, debian-installer-netboot
@@ -27,7 +27,17 @@
  This package contains images of the Debian Installer for the amd64
  architecture.
 
-Package: debian-installer-7.0-netboot-armel
+Package: debian-installer-8-netboot-arm64
+Architecture: all
+Depends: ${misc:Depends}
+Provides: debian-installer-netboot-arm64, debian-installer-netboot
+Suggests: tftpd-hpa
+Built-Using: ${d-i:built-using}
+Description: Debian-installer network boot images for arm64
+ This package contains images of the Debian Installer for the arm64
+ architecture.
+
+Package: debian-installer-8-netboot-armel
 Architecture: all
 Depends: ${misc:Depends}
 Provides: debian-installer-netboot-armel, debian-installer-netboot
@@ -37,7 +47,7 @@
  This package contains images of the Debian Installer for the armel
  architecture.
 
-Package: debian-installer-7.0-netboot-armhf
+Package: debian-installer-8-netboot-armhf
 Architecture: all
 Depends: ${misc:Depends}
 Provides: debian-installer-netboot-armhf, debian-installer-netboot
@@ -47,7 +57,7 @@
  This package contains images of the Debian Installer for the armhf
  architecture.
 
-Package: debian-installer-7.0-netboot-i386
+Package: debian-installer-8-netboot-i386
 Architecture: all
 Depends: ${misc:Depends}
 Provides: debian-installer-netboot-i386, debian-installer-netboot
@@ -57,17 +67,7 @@
  This package contains images of the Debian Installer for the i386
  architecture.
 
-Package: debian-installer-7.0-netboot-ia64
-Architecture: all
-Depends: ${misc:Depends}
-Provides: debian-installer-netboot-ia64, debian-installer-netboot
-Suggests: tftpd-hpa
-Built-Using: ${d-i:built-using}
-Description: Debian-installer network boot images for ia64
- This package contains images of the Debian Installer for the ia64
- architecture.
-
-Package: debian-installer-7.0-netboot-kfreebsd-amd64
+Package: debian-installer-8-netboot-kfreebsd-amd64
 Architecture: all
 Depends: ${misc:Depends}
 Provides: debian-installer-netboot-kfreebsd-amd64, debian-installer-netboot
@@ -77,7 +77,7 @@
  This package contains images of the Debian Installer for the kfreebsd-amd64
  architecture.
 
-Package: debian-installer-7.0-netboot-kfreebsd-i386
+Package: debian-installer-8-netboot-kfreebsd-i386
 Architecture: all
 Depends: ${misc:Depends}
 Provides: debian-installer-netboot-kfreebsd-i386, debian-installer-netboot
@@ -87,7 +87,7 @@
  This package contains images of the Debian Installer for the kfreebsd-i386
  architecture.
 
-Package: debian-installer-7.0-netboot-mips
+Package: debian-installer-8-netboot-mips
 Architecture: all
 Depends: ${misc:Depends}
 Provides: debian-installer-netboot-mips, debian-installer-netboot
@@ -97,7 +97,7 @@
  This package contains images of the Debian Installer for the mips
  architecture.
 
-Package: debian-installer-7.0-netboot-mipsel
+Package: debian-installer-8-netboot-mipsel
 Architecture: all
 Depends: ${misc:Depends}
 Provides: debian-installer-netboot-mipsel, debian-installer-netboot
@@ -107,7 +107,7 @@
  This package contains images of the Debian Installer for the mipsel
  architecture.
 
-Package: debian-installer-7.0-netboot-powerpc
+Package: debian-installer-8-netboot-powerpc
 Architecture: all
 Depends: ${misc:Depends}
 Provides: debian-installer-netboot-powerpc, debian-installer-netboot
@@ -117,13 +117,13 @@
  This package contains images of the Debian Installer for the powerpc
  architecture.
 
-Package: debian-installer-7.0-netboot-sparc
+Package: debian-installer-8-netboot-ppc64el
 Architecture: all
 Depends: ${misc:Depends}
-Provides: debian-installer-netboot-sparc, debian-installer-netboot
+Provides: debian-installer-netboot-ppc64el, debian-installer-netboot
 Suggests: tftpd-hpa
 Built-Using: ${d-i:built-using}
-Description: Debian-installer network boot images for sparc
- This package contains images of the Debian Installer for the sparc
+Description: Debian-installer network boot images for ppc64el
+ This package contains images of the Debian Installer for the ppc64el
  architecture.
 
diff -Nru debian-installer-netboot-images-20130613+deb7u2.b4/debian/control.in debian-installer-netboot-images-20150107/debian/control.in
--- debian-installer-netboot-images-20130613+deb7u2.b4/debian/control.in	2014-10-13 20:01:17.000000000 +0200
+++ debian-installer-netboot-images-20150107/debian/control.in	2014-10-27 10:46:30.000000000 +0100
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
 Uploaders: Otavio Salvador <otavio@debian.org>, Didier Raboud <odyx@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), wget,
+Build-Depends: debhelper (>= 9), wget,
  debian-archive-keyring,
  gpgv,
  dctrl-tools
diff -Nru debian-installer-netboot-images-20130613+deb7u2.b4/debian/lintian-overrides.in debian-installer-netboot-images-20150107/debian/lintian-overrides.in
--- debian-installer-netboot-images-20130613+deb7u2.b4/debian/lintian-overrides.in	2014-10-13 20:01:17.000000000 +0200
+++ debian-installer-netboot-images-20150107/debian/lintian-overrides.in	2014-10-28 09:00:53.000000000 +0100
@@ -2,3 +2,8 @@
 debian-installer-##IDENTIFIER##: image-file-in-usr-lib
 debian-installer-##IDENTIFIER##: statically-linked-binary
 debian-installer-##IDENTIFIER##: unstripped-binary-or-object
+debian-installer-##IDENTIFIER##: embedded-library
+debian-installer-##IDENTIFIER##: shared-lib-without-dependency-information
+debian-installer-##IDENTIFIER##: library-not-linked-against-libc
+debian-installer-##IDENTIFIER##: shlib-with-executable-stack
+debian-installer-##IDENTIFIER##: missing-depends-line
diff -Nru debian-installer-netboot-images-20130613+deb7u2.b4/debian/README debian-installer-netboot-images-20150107/debian/README
--- debian-installer-netboot-images-20130613+deb7u2.b4/debian/README	2014-10-13 20:01:17.000000000 +0200
+++ debian-installer-netboot-images-20150107/debian/README	2014-10-28 15:20:45.000000000 +0100
@@ -3,7 +3,7 @@
 
   * This package contains the netboot images for all architectures that
     have netboot support in Debian Installer. Currently, this includes
-    all officially supported architectures except s390 and s390x.
+    all officially supported architectures except s390x.
 
   * Note about versioning:
      - This package's version is simply the version of the d-i netboot
diff -Nru debian-installer-netboot-images-20130613+deb7u2.b4/debian/rules debian-installer-netboot-images-20150107/debian/rules
--- debian-installer-netboot-images-20130613+deb7u2.b4/debian/rules	2014-10-13 20:01:17.000000000 +0200
+++ debian-installer-netboot-images-20150107/debian/rules	2014-10-28 15:18:04.000000000 +0100
@@ -1,13 +1,14 @@
 #!/usr/bin/make -f
 
-export MAJOR_VERSION=7.0
-export DISTRIBUTION=wheezy-proposed-updates
+export MAJOR_VERSION=8
+export DISTRIBUTION=jessie
 export MIRROR=http://http.debian.net/debian
 export VERSION=$(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
+export KFREEBSD_KERNEL_MAJOR=10
 
 # Don't forget to recreate debian/control after editing these lines: $ debian/rules debian/control
-SUPPORTED_ARCHITECTURES = amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc sparc
-UNSUPPORTED_ARCHITECTURES = hurd-i386 s390 s390x
+SUPPORTED_ARCHITECTURES = amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64el
+UNSUPPORTED_ARCHITECTURES = hurd-i386 s390x sparc
 
 %:
 	dh $@
diff -Nru debian-installer-netboot-images-20130613+deb7u2.b4/get-images.sh debian-installer-netboot-images-20150107/get-images.sh
--- debian-installer-netboot-images-20130613+deb7u2.b4/get-images.sh	2014-10-13 20:01:17.000000000 +0200
+++ debian-installer-netboot-images-20150107/get-images.sh	2014-10-28 15:21:07.000000000 +0100
@@ -38,16 +38,21 @@
 	BUILD_PWD=$(pwd)
 	cd $DESTDIR/$ARCHITECTURE
 
-	if wget -c $BASEDIR/netboot/netboot.tar.gz -O netboot-text.tar.gz; then
+        NETBOOTDIR_POSTFIX=
+	if [ ${ARCHITECTURE:-} = "kfreebsd-amd64" -o ${ARCHITECTURE:-} = "kfreebsd-i386" ]; then
+		NETBOOTDIR_POSTFIX=-$KFREEBSD_KERNEL_MAJOR
+	fi
+
+	if wget -c $BASEDIR/netboot${NETBOOTDIR_POSTFIX}/netboot.tar.gz -O netboot-text.tar.gz; then
 		# Only check the stronger hash
-		# check_md5sum_file './netboot/netboot.tar.gz' netboot-text.tar.gz $MD5SUM_FILE
-		check_sha256sum_file './netboot/netboot.tar.gz' netboot-text.tar.gz $SHA256SUM_FILE
+		# check_md5sum_file "./netboot${NETBOOTDIR_POSTFIX}/netboot.tar.gz" netboot-text.tar.gz $MD5SUM_FILE
+		check_sha256sum_file "./netboot${NETBOOTDIR_POSTFIX}/netboot.tar.gz" netboot-text.tar.gz $SHA256SUM_FILE
 		unpack_installer $ARCHITECTURE/text netboot-text.tar.gz
 
-		if wget -c $BASEDIR/netboot/gtk/netboot.tar.gz -O netboot-gtk.tar.gz; then
+		if wget -c $BASEDIR/netboot${NETBOOTDIR_POSTFIX}/gtk/netboot.tar.gz -O netboot-gtk.tar.gz; then
 			# Only check the stronger hash
-			# check_md5sum_file './netboot/gtk/netboot.tar.gz' netboot-gtk.tar.gz $MD5SUM_FILE
-			check_sha256sum_file './netboot/gtk/netboot.tar.gz' netboot-gtk.tar.gz $SHA256SUM_FILE
+			# check_md5sum_file "./netboot${NETBOOTDIR_POSTFIX}/gtk/netboot.tar.gz" netboot-gtk.tar.gz $MD5SUM_FILE
+			check_sha256sum_file "./netboot${NETBOOTDIR_POSTFIX}/gtk/netboot.tar.gz" netboot-gtk.tar.gz $SHA256SUM_FILE
 			unpack_installer $ARCHITECTURE/gtk netboot-gtk.tar.gz
 		else
 			rm -f netboot-gtk.tar.gz

Attachment: signature.asc
Description: This is a digitally signed message part.


Reply to: