Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package ltsp
This fixes two RC bugs, one which can result in the old wheezy kernel
being used on after upgrading to jessie, and another which breaks
removal of linux-image packages on armhf.
It also fixes two important issues, uneccesary configuration of
pulseaudio on ltsp chroot creation, and removing .dtb files copied into
the tftp dirs but don't have corresponding kernels installed.
A documentation issue in debian/copyright removes outdated VCS
information (which is present in debian/control).
All of the patches are taken from upstream, for what it's worth.
Thanks for considering!
diff -Nru ltsp-5.5.4/debian/changelog ltsp-5.5.4/debian/changelog
--- ltsp-5.5.4/debian/changelog 2014-10-21 23:33:38.000000000 -0700
+++ ltsp-5.5.4/debian/changelog 2014-12-01 15:22:13.000000000 -0800
@@ -1,3 +1,21 @@
+ltsp (5.5.4-2) unstable; urgency=medium
+
+ * ltsp-update-kernels/update-kernels: Fix kernel version sorting that
+ results in clients booting obsolete kernels (Closes: #771470).
+
+ * update-kernels: Suppress mkimage output, as it prevents linux-image
+ packages from being removed successfully (Closes: #771728).
+
+ * ltsp-build-client: Remove plugin that needlessly modifies pulseaudio
+ configuration files.
+
+ * ltsp-update-kernels: Remove dtb files when corresponding kernel
+ version is no longer present.
+
+ * debian/copyright: Remove outdated VCS information.
+
+ -- Vagrant Cascadian <vagrant@debian.org> Mon, 01 Dec 2014 15:22:01 -0800
+
ltsp (5.5.4-1) unstable; urgency=medium
* New upstream version:
diff -Nru ltsp-5.5.4/debian/copyright ltsp-5.5.4/debian/copyright
--- ltsp-5.5.4/debian/copyright 2014-08-02 15:43:04.000000000 -0700
+++ ltsp-5.5.4/debian/copyright 2014-10-24 10:15:51.000000000 -0700
@@ -6,11 +6,7 @@
The upstream source tree can be found on launchpad:
- bzr get http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ltsp-trunk
-
-The debian dir for ltsp packages in Debian is maintained in bzr:
-
- bzr get http://bzr.debian.org/bzr/pkg-ltsp/ltsp-debian-packaging
+ bzr branch http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ltsp-trunk
The original LTSP sources can be downloaded from: http://ltsp.org
diff -Nru ltsp-5.5.4/debian/patches/series ltsp-5.5.4/debian/patches/series
--- ltsp-5.5.4/debian/patches/series 2014-10-15 15:44:17.000000000 -0700
+++ ltsp-5.5.4/debian/patches/series 2014-12-01 15:16:53.000000000 -0800
@@ -2,3 +2,9 @@
getltscfg-makefile-flags
jetpipe-from-ltsp-client-core-init-script
manpages-use-debian-version
+upstream/0004-Debian-Remove-ltsp-build-client-plugin-pulseaudio-tw.patch
+upstream/0013-ltsp-update-kernels-Remove-.dtb-files-when-kernel-ve.patch
+upstream/0015-Correctly-sort-kernel-FLAVOR-in-increasing-order-and.patch
+upstream/0016-update-kernels-Fix-issues-with-kernel-version-varian.patch
+upstream/0017-Debian-update-kernels.conf-Prefer-586-over-486-in-fo.patch
+upstream/0018-update-kernels-Quiet-down-mkimage-output-when-genera.patch
diff -Nru ltsp-5.5.4/debian/patches/upstream/0004-Debian-Remove-ltsp-build-client-plugin-pulseaudio-tw.patch ltsp-5.5.4/debian/patches/upstream/0004-Debian-Remove-ltsp-build-client-plugin-pulseaudio-tw.patch
--- ltsp-5.5.4/debian/patches/upstream/0004-Debian-Remove-ltsp-build-client-plugin-pulseaudio-tw.patch 1969-12-31 16:00:00.000000000 -0800
+++ ltsp-5.5.4/debian/patches/upstream/0004-Debian-Remove-ltsp-build-client-plugin-pulseaudio-tw.patch 2014-11-29 13:26:14.000000000 -0800
@@ -0,0 +1,40 @@
+From 9fc1793d4fb7b40c043cbb0639ec2bc6c9de10a3 Mon Sep 17 00:00:00 2001
+From: Vagrant Cascadian <vagrant@debian.org>
+Date: Thu, 23 Oct 2014 15:36:50 -0700
+Subject: [PATCH 04/17] Debian: Remove ltsp-build-client plugin
+ pulseaudio-tweaks, as the customizations are no longer needed.
+
+---
+ .../ltsp-build-client/Debian/010-pulseaudio-tweaks | 20 --------------------
+ 1 file changed, 20 deletions(-)
+ delete mode 100644 server/share/ltsp/plugins/ltsp-build-client/Debian/010-pulseaudio-tweaks
+
+diff --git a/server/share/ltsp/plugins/ltsp-build-client/Debian/010-pulseaudio-tweaks b/server/share/ltsp/plugins/ltsp-build-client/Debian/010-pulseaudio-tweaks
+deleted file mode 100644
+index 65e7dca..0000000
+--- a/server/share/ltsp/plugins/ltsp-build-client/Debian/010-pulseaudio-tweaks
++++ /dev/null
+@@ -1,20 +0,0 @@
+-# a number of hacks needed to resolve: http://bugs.debian.org/537526
+-case "$MODE" in
+- finalization)
+- # some versions of pulseaudio need /var/lib/pulse to be present, but
+- # create it dynamically. create the directory so we can bind-mount it.
+- mkdir $ROOT/var/lib/pulse
+-
+- # workaround to get pulseaudio to start on thin-clients with only 64MB
+- # of ram.
+- if [ -f "$ROOT/etc/pulse/daemon.conf" ] && [ "$DIST" != "lenny" ]; then
+- echo 'shm-size-bytes = 65535' >> "$ROOT/etc/pulse/daemon.conf"
+- fi
+-
+- # move aside the system.pa, which tries to load hal-based modules, and
+- # dies badly. it works fine without it.
+- if [ -f "$ROOT/etc/pulse/system.pa" ]; then
+- mv "$ROOT/etc/pulse/system.pa" "$ROOT/etc/pulse/system.pa.ltsp" || true
+- fi
+- ;;
+-esac
+--
+2.1.3
+
diff -Nru ltsp-5.5.4/debian/patches/upstream/0013-ltsp-update-kernels-Remove-.dtb-files-when-kernel-ve.patch ltsp-5.5.4/debian/patches/upstream/0013-ltsp-update-kernels-Remove-.dtb-files-when-kernel-ve.patch
--- ltsp-5.5.4/debian/patches/upstream/0013-ltsp-update-kernels-Remove-.dtb-files-when-kernel-ve.patch 1969-12-31 16:00:00.000000000 -0800
+++ ltsp-5.5.4/debian/patches/upstream/0013-ltsp-update-kernels-Remove-.dtb-files-when-kernel-ve.patch 2014-11-29 13:26:14.000000000 -0800
@@ -0,0 +1,25 @@
+From 01d0ba861d9bb7c0cc4569d0cee8d0f35e8d804b Mon Sep 17 00:00:00 2001
+From: Vagrant Cascadian <vagrant@debian.org>
+Date: Sun, 23 Nov 2014 19:14:18 -0800
+Subject: [PATCH 13/17] ltsp-update-kernels: Remove .dtb files when kernel
+ version is no longer installed.
+
+---
+ server/ltsp-update-kernels | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/server/ltsp-update-kernels b/server/ltsp-update-kernels
+index 5258ee8..4a71b2b 100755
+--- a/server/ltsp-update-kernels
++++ b/server/ltsp-update-kernels
+@@ -191,6 +191,7 @@ cleanup_kernels() {
+ rm -f "$tftpboot/$name/$kernel"
+ rm -f "$tftpboot/$name/config-$version"
+ rm -f "$tftpboot/$name/System.map-$version"
++ rm -rf "$tftpboot/$name/dtbs-$version/"
+ # Fedora
+ rm -f "$tftpboot/$name/initrd-$version.img"
+ rm -f "$tftpboot/$name/initramfs-$version.img"
+--
+2.1.3
+
diff -Nru ltsp-5.5.4/debian/patches/upstream/0015-Correctly-sort-kernel-FLAVOR-in-increasing-order-and.patch ltsp-5.5.4/debian/patches/upstream/0015-Correctly-sort-kernel-FLAVOR-in-increasing-order-and.patch
--- ltsp-5.5.4/debian/patches/upstream/0015-Correctly-sort-kernel-FLAVOR-in-increasing-order-and.patch 1969-12-31 16:00:00.000000000 -0800
+++ ltsp-5.5.4/debian/patches/upstream/0015-Correctly-sort-kernel-FLAVOR-in-increasing-order-and.patch 2014-12-01 14:07:32.000000000 -0800
@@ -0,0 +1,92 @@
+From 5c0bee3803199567f485e4fc9c8e92b1fbb9f5b5 Mon Sep 17 00:00:00 2001
+From: Alkis Georgopoulos <alkisg@gmail.com>
+Date: Sat, 29 Nov 2014 17:51:04 +0200
+Subject: [PATCH 15/17] Correctly sort kernel FLAVOR in increasing order and
+ VERSION in decreasing.
+Bug-Debian: https://bugs.debian.org/771470
+
+---
+ client/Debian/etc/ltsp/update-kernels.conf | 2 +-
+ client/Debian/share/ltsp/cleanup.d/50-vmlinuz | 2 +-
+ client/Ubuntu/etc/ltsp/update-kernels.conf | 2 +-
+ client/share/ltsp/update-kernels | 4 ++--
+ server/ltsp-update-kernels | 2 +-
+ 5 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/client/Debian/etc/ltsp/update-kernels.conf b/client/Debian/etc/ltsp/update-kernels.conf
+index b22e0a6..97131b5 100644
+--- a/client/Debian/etc/ltsp/update-kernels.conf
++++ b/client/Debian/etc/ltsp/update-kernels.conf
+@@ -28,7 +28,7 @@ CMDLINE_NBD="root=/dev/nbd0"
+ CMDLINE_AOE="root=/dev/etherd/e0.0"
+
+ # A sed expression that matches all kernels and returns $FILE $NAME $VERSION $FLAVOR
+-# Example: ls /boot | sed -n "$KERNEL_NAMES" | sort -V -k 4,4 | sort -r -k 3,3
++# Example: ls /boot | sed -n "$KERNEL_NAMES" | sort -k 4,4V -k 3,3rV
+ KERNEL_NAMES='s/\(vmlinu[xz]-\)\([^-]*-[^-]*-\)\(.*\)/& \1 \2 \3/p'
+
+ # A sed expression that maps from a kernel name to an initrd name
+diff --git a/client/Debian/share/ltsp/cleanup.d/50-vmlinuz b/client/Debian/share/ltsp/cleanup.d/50-vmlinuz
+index 3a88d30..82fb818 100644
+--- a/client/Debian/share/ltsp/cleanup.d/50-vmlinuz
++++ b/client/Debian/share/ltsp/cleanup.d/50-vmlinuz
+@@ -14,7 +14,7 @@ INITRD_NAME=${INITRD_NAME:-'s/vmlinu[xz]/initrd.img/p'}
+
+ read file name version flavor <<EOF
+ $(find "/boot/" -mindepth 1 -maxdepth 1 -type f -printf "%f\n" |
+- sed -n "$KERNEL_NAMES" | sort -V -k 4,4 | sort -r -k 3,3)
++ sed -n "$KERNEL_NAMES" | sort -k 4,4V -k 3,3rV)
+ EOF
+ initrd=$(echo "$file" | sed -n "$INITRD_NAME")
+
+diff --git a/client/Ubuntu/etc/ltsp/update-kernels.conf b/client/Ubuntu/etc/ltsp/update-kernels.conf
+index 059cd68..6e3d2f8 100644
+--- a/client/Ubuntu/etc/ltsp/update-kernels.conf
++++ b/client/Ubuntu/etc/ltsp/update-kernels.conf
+@@ -28,7 +28,7 @@ CMDLINE_NBD="root=/dev/nbd0"
+ CMDLINE_AOE="root=/dev/etherd/e0.0"
+
+ # A sed expression that matches all kernels and returns $FILE $NAME $VERSION $FLAVOR
+-# Example: ls /boot | sed -n "$KERNEL_NAMES" | sort -V -k 4,4 | sort -r -k 3,3
++# Example: ls /boot | sed -n "$KERNEL_NAMES" | sort -k 4,4V -k 3,3rV
+ KERNEL_NAMES='s/\(vmlinu[xz]-\)\([^-]*-[^-]*-\)\(.*\)/& \1 \2 \3/p'
+
+ # A sed expression that maps from a kernel name to an initrd name
+diff --git a/client/share/ltsp/update-kernels b/client/share/ltsp/update-kernels
+index 61e7eae..96310fb 100755
+--- a/client/share/ltsp/update-kernels
++++ b/client/share/ltsp/update-kernels
+@@ -67,7 +67,7 @@ kernel_split() {
+ ;;
+ esac
+ done
+- done | sed -n "$KERNEL_NAMES" | sort -V -k 4,4 | sort -r -k 3,3
++ done | sed -n "$KERNEL_NAMES" | sort -k 4,4V -k 3,3rV
+
+ eval "$orig_flags"
+ }
+@@ -102,7 +102,7 @@ cmdline_method_default=$(eval echo '$CMDLINE_'$boot_method_default)
+ BOOTPROMPT_OPTS="$CMDLINE_LINUX_DEFAULTS $cmdline_method_default"
+
+ # A sed expression that matches all kernels and returns $FILE $NAME $VERSION $FLAVOR
+-# Example: ls /boot | sed -n "$KERNEL_NAMES" | sort -V -k 4,4 | sort -r -k 3,3
++# Example: ls /boot | sed -n "$KERNEL_NAMES" | sort -k 4,4V -k 3,3rV
+ KERNEL_NAMES=${KERNEL_NAMES:-'s/\(vmlinu[xz]-\)\([^-]*-[^-]*-\)\(.*\)/& \1 \2 \3/p'}
+
+ if [ -f /usr/lib/yaboot/yaboot ]; then
+diff --git a/server/ltsp-update-kernels b/server/ltsp-update-kernels
+index 4a71b2b..3e08149 100755
+--- a/server/ltsp-update-kernels
++++ b/server/ltsp-update-kernels
+@@ -151,7 +151,7 @@ link_kernel_flavors() {
+
+ last_flavor=
+ find "$tftpname" -mindepth 1 -maxdepth 1 -type f -printf "%f\n" \
+- | sed -n "$KERNEL_NAMES" | sort -V -k 4,4 | sort -r -k 3,3 \
++ | sed -n "$KERNEL_NAMES" | sort -k 4,4V -k 3,3rV \
+ | while read file name version flavor; do
+ if [ "$flavor" != "$last_flavor" ]; then
+ initrd=$(echo "$file" | sed -n "$INITRD_NAME")
+--
+2.1.3
+
diff -Nru ltsp-5.5.4/debian/patches/upstream/0016-update-kernels-Fix-issues-with-kernel-version-varian.patch ltsp-5.5.4/debian/patches/upstream/0016-update-kernels-Fix-issues-with-kernel-version-varian.patch
--- ltsp-5.5.4/debian/patches/upstream/0016-update-kernels-Fix-issues-with-kernel-version-varian.patch 1969-12-31 16:00:00.000000000 -0800
+++ ltsp-5.5.4/debian/patches/upstream/0016-update-kernels-Fix-issues-with-kernel-version-varian.patch 2014-12-01 14:09:08.000000000 -0800
@@ -0,0 +1,67 @@
+From 05bd0088109b1d5938331bfa9ff33587ff1a911c Mon Sep 17 00:00:00 2001
+From: Vagrant Cascadian <vagrant@debian.org>
+Date: Sat, 29 Nov 2014 10:57:26 -0800
+Subject: [PATCH 16/17] update-kernels: Fix issues with kernel version variant
+ sorting by first looping on the preferred variants, and using the keyword
+ "ALL" instead of "*" to avoid shell globbing issues.
+Bug-Debian: https://bugs.debian.org/771470
+
+---
+ client/share/ltsp/update-kernels | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/client/share/ltsp/update-kernels b/client/share/ltsp/update-kernels
+index 96310fb..5e079be 100755
+--- a/client/share/ltsp/update-kernels
++++ b/client/share/ltsp/update-kernels
+@@ -59,6 +59,9 @@ kernel_split() {
+ set -f
+ for kernel in $(find "/boot/" -type f -name "$KERNEL_PREFIX$KERNEL_SUFFIX" -printf "%f\n"); do
+ # Validate the "arch"
++ if [ "${LIST_KERNELS}" = "ALL" ]; then
++ LIST_KERNELS="*"
++ fi
+ for arch in ${LIST_KERNELS:-*}; do
+ case "$kernel" in
+ $KERNEL_PREFIX$arch$KERNEL_SUFFIX)
+@@ -73,7 +76,9 @@ kernel_split() {
+ }
+
+ kernel_versions(){
+- kernel_split | awk '{print $3$4}'
++ for arch in ${LIST_KERNELS:-"ALL"} ; do
++ LIST_KERNELS="$arch" kernel_split | awk '{print $3$4}'
++ done
+ }
+
+ kernel_variants(){
+@@ -205,7 +210,7 @@ EOF
+ pxelinux_include_files="$pxelinux_include_files ltsp-$method"
+ # Get the preferred default kernel, preferred 32-bit kernel, or any
+ # kernel.
+- version=$(LIST_KERNELS="$LIST_KERNELS_DEFAULT $LIST_KERNELS_32 *" kernel_versions | head -n 1)
++ version=$(LIST_KERNELS="$LIST_KERNELS_DEFAULT $LIST_KERNELS_32 ALL" kernel_versions | head -n 1)
+ cat > $PXECFG/ltsp-$method <<EOF
+ # This file is regenerated when update-kernels runs.
+ # Do not edit, see /etc/ltsp/update-kernels.conf instead.
+@@ -250,7 +255,7 @@ EOF
+ 32) list_kernels="$LIST_KERNELS_32" ;;
+ esac
+ # only return the newest kernel of appropriate type.
+- version=$(LIST_KERNELS="$list_kernels *" kernel_versions | head -n 1)
++ version=$(LIST_KERNELS="$list_kernels ALL" kernel_versions | head -n 1)
+ cat >> $PXECFG/ltsp-ifcpu64-$method <<EOF
+
+ label ltsp-$method-$type
+@@ -313,7 +318,7 @@ if [ "$(detect_arch)" = "armhf" ] || [ "$(detect_arch)" = "armel" ]; then
+ if which mkimage >/dev/null; then
+ # Generate a boot script for use with versions of u-boot
+ # supporting bootz.
+- version=$(LIST_KERNELS="$LIST_KERNELS_DEFAULT $LIST_KERNELS_ARM *" kernel_versions | head -n 1)
++ version=$(LIST_KERNELS="$LIST_KERNELS_DEFAULT $LIST_KERNELS_ARM ALL" kernel_versions | head -n 1)
+ kernel_file="/ltsp/${CHROOT_NAME}/vmlinuz-${version}"
+ initrd_file="/ltsp/${CHROOT_NAME}/initrd.img-${version}"
+ fdt_dir="/ltsp/${CHROOT_NAME}/dtbs-${version}/"
+--
+2.1.3
+
diff -Nru ltsp-5.5.4/debian/patches/upstream/0017-Debian-update-kernels.conf-Prefer-586-over-486-in-fo.patch ltsp-5.5.4/debian/patches/upstream/0017-Debian-update-kernels.conf-Prefer-586-over-486-in-fo.patch
--- ltsp-5.5.4/debian/patches/upstream/0017-Debian-update-kernels.conf-Prefer-586-over-486-in-fo.patch 1969-12-31 16:00:00.000000000 -0800
+++ ltsp-5.5.4/debian/patches/upstream/0017-Debian-update-kernels.conf-Prefer-586-over-486-in-fo.patch 2014-12-01 14:09:05.000000000 -0800
@@ -0,0 +1,24 @@
+From 144eeefb27c639a9124f8e32ecdf13208c065c52 Mon Sep 17 00:00:00 2001
+From: Vagrant Cascadian <vagrant@debian.org>
+Date: Sat, 29 Nov 2014 11:08:02 -0800
+Subject: [PATCH 17/17] Debian: update-kernels.conf: Prefer 586 over 486 in for
+ 32 bit systems, as 486 is no longer shipped in Jessie.
+Bug-Debian: https://bugs.debian.org/771470
+
+---
+ client/Debian/etc/ltsp/update-kernels.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: ltsp/client/Debian/etc/ltsp/update-kernels.conf
+===================================================================
+--- ltsp.orig/client/Debian/etc/ltsp/update-kernels.conf
++++ ltsp/client/Debian/etc/ltsp/update-kernels.conf
+@@ -44,7 +44,7 @@ LIST_KERNELS_64="amd64"
+ # Variants that are supported by PAE capable CPUs
+ LIST_KERNELS_PAE="686-pae 686-bigmem 686"
+ # Variants that are widely supported (i.e. 32-bit CPUs)
+-LIST_KERNELS_32="486 686"
++LIST_KERNELS_32="586 486 686"
+ # Preferred default kernel order
+ #LIST_KERNELS_DEFAULT="486-custom 686-custom"
+
diff -Nru ltsp-5.5.4/debian/patches/upstream/0018-update-kernels-Quiet-down-mkimage-output-when-genera.patch ltsp-5.5.4/debian/patches/upstream/0018-update-kernels-Quiet-down-mkimage-output-when-genera.patch
--- ltsp-5.5.4/debian/patches/upstream/0018-update-kernels-Quiet-down-mkimage-output-when-genera.patch 1969-12-31 16:00:00.000000000 -0800
+++ ltsp-5.5.4/debian/patches/upstream/0018-update-kernels-Quiet-down-mkimage-output-when-genera.patch 2014-12-01 14:06:49.000000000 -0800
@@ -0,0 +1,28 @@
+From 00f3606fa960f9af1d07317dbea59f1e294ad5fe Mon Sep 17 00:00:00 2001
+From: Vagrant Cascadian <vagrant@debian.org>
+Date: Sat, 29 Nov 2014 18:51:39 -0800
+Subject: [PATCH] update-kernels: Quiet down mkimage output when generating
+ boot.scr.
+Bug-Debian: https://bugs.debian.org/771728
+
+---
+ client/share/ltsp/update-kernels | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/client/share/ltsp/update-kernels b/client/share/ltsp/update-kernels
+index 5e079be..1a75103 100755
+--- a/client/share/ltsp/update-kernels
++++ b/client/share/ltsp/update-kernels
+@@ -352,7 +352,8 @@ tftpboot \${kernel_addr_r} \${serverip}:${kernel_file} \\
+ EOF
+
+ mkimage -A arm -O Linux -T script -C none -a 0x0 -e 0x0 \
+- -n 'LTSP boot script' -d $BOOT/boot.ltsp $BOOT/boot.scr
++ -n 'LTSP boot script' -d $BOOT/boot.ltsp $BOOT/boot.scr \
++ > /dev/null
+
+ # Copy .dtb files to boot dir.
+ dtb_dirs="/usr/lib/linux-image-${version}/"
+--
+2.1.3
+
unblock ltsp/5.5.4-2
live well,
vagrant
Attachment:
signature.asc
Description: PGP signature