From 95f79b7af91f2b534279bdee99e355382914c7af Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sat, 9 Mar 2019 20:31:15 +0100 Subject: [PATCH] contrib/cronjob.weekly: drop -usb from Debian Edu BD images names. contrib/cronjob.weekly: drop -usb from CDNAME for Debian Edu BD images, as "usb" is both wrong as well as redundant as 'BD' is also part of the generated filenames. Signed-off-by: Holger Levsen --- contrib/cronjob.weekly | 4 ++-- debian/changelog | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/contrib/cronjob.weekly b/contrib/cronjob.weekly index 778970a5..31140f10 100755 --- a/contrib/cronjob.weekly +++ b/contrib/cronjob.weekly @@ -305,7 +305,7 @@ if lockfile -r0 $BUILDLOCK ; then # USB "BD" image build_started EDUUSB NORECOMMENDS=0 COMPLETE=0 INSTALLER_CD=K \ - CDNAME=debian-edu-usb \ + CDNAME=debian-edu \ DEBIAN_EDU=1 \ KERNEL_PARAMS="modules=debian-edu-install-udeb" \ DESKTOP=xfce VARIANTS=xen \ @@ -319,7 +319,7 @@ if lockfile -r0 $BUILDLOCK ; then build_started EDUUSBFIRMWARE NORECOMMENDS=0 COMPLETE=0 INSTALLER_CD=L \ FORCE_FIRMWARE=1 \ - CDNAME=firmware-edu-usb \ + CDNAME=firmware-edu \ DEBIAN_EDU=1 \ KERNEL_PARAMS="modules=debian-edu-install-udeb" \ DESKTOP=xfce VARIANTS=xen \ diff --git a/debian/changelog b/debian/changelog index cb8cf740..a082563a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,11 @@ debian-cd (3.1.24) UNRELEASED; urgency=medium * tasks/buster/Debian-edu-full: Force missing packages onto the Edu BD. (This is a workaround for the effects of #601203) + [ Holger Levsen ] + * contrib/cronjob.weekly: drop -usb from CDNAME for Debian Edu BD images, as + "usb" is both wrong as well as redundant as 'BD' is also part of the + generated filenames. + -- Holger Levsen Wed, 20 Feb 2019 14:12:16 +0100 debian-cd (3.1.23) unstable; urgency=medium