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 <holger@layer-acht.org>
This commit is contained in:
Holger Levsen 2019-03-09 20:31:15 +01:00
parent f2c78677ab
commit 95f79b7af9
2 changed files with 7 additions and 2 deletions

View File

@ -305,7 +305,7 @@ if lockfile -r0 $BUILDLOCK ; then
# USB "BD" image # USB "BD" image
build_started EDUUSB build_started EDUUSB
NORECOMMENDS=0 COMPLETE=0 INSTALLER_CD=K \ NORECOMMENDS=0 COMPLETE=0 INSTALLER_CD=K \
CDNAME=debian-edu-usb \ CDNAME=debian-edu \
DEBIAN_EDU=1 \ DEBIAN_EDU=1 \
KERNEL_PARAMS="modules=debian-edu-install-udeb" \ KERNEL_PARAMS="modules=debian-edu-install-udeb" \
DESKTOP=xfce VARIANTS=xen \ DESKTOP=xfce VARIANTS=xen \
@ -319,7 +319,7 @@ if lockfile -r0 $BUILDLOCK ; then
build_started EDUUSBFIRMWARE build_started EDUUSBFIRMWARE
NORECOMMENDS=0 COMPLETE=0 INSTALLER_CD=L \ NORECOMMENDS=0 COMPLETE=0 INSTALLER_CD=L \
FORCE_FIRMWARE=1 \ FORCE_FIRMWARE=1 \
CDNAME=firmware-edu-usb \ CDNAME=firmware-edu \
DEBIAN_EDU=1 \ DEBIAN_EDU=1 \
KERNEL_PARAMS="modules=debian-edu-install-udeb" \ KERNEL_PARAMS="modules=debian-edu-install-udeb" \
DESKTOP=xfce VARIANTS=xen \ DESKTOP=xfce VARIANTS=xen \

5
debian/changelog vendored
View File

@ -4,6 +4,11 @@ debian-cd (3.1.24) UNRELEASED; urgency=medium
* tasks/buster/Debian-edu-full: Force missing packages onto the Edu BD. * tasks/buster/Debian-edu-full: Force missing packages onto the Edu BD.
(This is a workaround for the effects of #601203) (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 <holger@debian.org> Wed, 20 Feb 2019 14:12:16 +0100 -- Holger Levsen <holger@debian.org> Wed, 20 Feb 2019 14:12:16 +0100
debian-cd (3.1.23) unstable; urgency=medium debian-cd (3.1.23) unstable; urgency=medium