Compare commits

...

8 Commits

Author SHA1 Message Date
Colin Watson
0849ac91a9 releasing version 2.65.4 2012-12-03 15:46:16 +00:00
Colin Watson
16d0f37947 live-build/auto/config: Convince live-build to use the
-generic-lts-quantal kernels on Ubuntu/Edubuntu amd64/i386.
2012-12-03 15:34:07 +00:00
Colin Watson
1d6aa5d69b releasing version 2.65.3 2012-11-28 16:46:59 +00:00
Colin Watson
d9a0f4cf37 live-build/auto/config: Manually add linux-signed-generic-lts-quantal to
Ubuntu/Edubuntu amd64 builds, since nothing deals with updating Task
fields in the archive post-release.
2012-11-28 16:45:55 +00:00
Colin Watson
e3a4f1d10f releasing version 2.65.2 2012-11-21 22:35:17 +00:00
Colin Watson
07a3e800b1 live-build/auto/build: If they exist, link *.efi.signed versions of the
kernel to binary/$INITFS/kernel-$FLAVOUR.efi.signed (LP: #1075181).
2012-11-21 22:33:18 +00:00
Colin Watson
5ce5a62908 releasing version 2.65.1 2012-06-30 07:23:19 +01:00
Colin Watson
3524c3f117 live-build/auto/config: Emit sources.list entries for -proposed if the
environment variable PROPOSED is set (LP: #1019514).
2012-06-30 07:22:15 +01:00
3 changed files with 90 additions and 1 deletions

29
debian/changelog vendored
View File

@ -1,3 +1,32 @@
livecd-rootfs (2.65.4) precise-proposed; urgency=low
* live-build/auto/config: Convince live-build to use the
-generic-lts-quantal kernels on Ubuntu/Edubuntu amd64/i386.
-- Colin Watson <cjwatson@ubuntu.com> Mon, 03 Dec 2012 15:36:29 +0000
livecd-rootfs (2.65.3) precise-proposed; urgency=low
* live-build/auto/config: Manually add linux-signed-generic-lts-quantal to
Ubuntu/Edubuntu amd64 builds, since nothing deals with updating Task
fields in the archive post-release.
-- Colin Watson <cjwatson@ubuntu.com> Wed, 28 Nov 2012 16:45:59 +0000
livecd-rootfs (2.65.2) precise-proposed; urgency=low
* live-build/auto/build: If they exist, link *.efi.signed versions of the
kernel to binary/$INITFS/kernel-$FLAVOUR.efi.signed (LP: #1075181).
-- Colin Watson <cjwatson@ubuntu.com> Wed, 21 Nov 2012 22:34:30 +0000
livecd-rootfs (2.65.1) precise-proposed; urgency=low
* live-build/auto/config: Emit sources.list entries for -proposed if the
environment variable PROPOSED is set (LP: #1019514).
-- Colin Watson <cjwatson@ubuntu.com> Sat, 30 Jun 2012 07:22:25 +0100
livecd-rootfs (2.65) precise; urgency=low livecd-rootfs (2.65) precise; urgency=low
* Add (extra-)override parsing to the preinstalled pool to make sure * Add (extra-)override parsing to the preinstalled pool to make sure

View File

@ -311,7 +311,7 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
if [ -z "$LB_LINUX_FLAVOURS" ] || [ "$LB_LINUX_FLAVOURS" = "none" ]; then if [ -z "$LB_LINUX_FLAVOURS" ] || [ "$LB_LINUX_FLAVOURS" = "none" ]; then
continue continue
fi fi
KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-* 2>/dev/null || true) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )" KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-* 2>/dev/null || true) | fgrep -v .efi | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
if [ -z "$KVERS" ]; then if [ -z "$KVERS" ]; then
if [ -e "binary/$INITFS/vmlinuz" ]; then if [ -e "binary/$INITFS/vmlinuz" ]; then
# already renamed by ubuntu-defaults-image # already renamed by ubuntu-defaults-image
@ -326,6 +326,9 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
exit 1 exit 1
fi fi
ln "binary/$INITFS/"vmlinu?-"$KVERS" "$PREFIX.kernel-$FLAVOUR" ln "binary/$INITFS/"vmlinu?-"$KVERS" "$PREFIX.kernel-$FLAVOUR"
if [ -e "binary/$INITFS/"vmlinu?-"$KVERS.efi.signed" ]; then
ln "binary/$INITFS/"vmlinu?-"$KVERS.efi.signed" "$PREFIX.kernel-$FLAVOUR.efi.signed"
fi
chmod 644 "$PREFIX.kernel-$FLAVOUR" chmod 644 "$PREFIX.kernel-$FLAVOUR"
if [ -e "binary/$INITFS/initrd.img-$KVERS" ]; then if [ -e "binary/$INITFS/initrd.img-$KVERS" ]; then
ln "binary/$INITFS/initrd.img-$KVERS" "$PREFIX.initrd-$FLAVOUR" ln "binary/$INITFS/initrd.img-$KVERS" "$PREFIX.initrd-$FLAVOUR"

View File

@ -127,6 +127,18 @@ case $PROJECT in
ubuntu|ubuntu-dvd) ubuntu|ubuntu-dvd)
add_task install minimal standard ubuntu-desktop add_task install minimal standard ubuntu-desktop
LIVE_TASK='ubuntu-live' LIVE_TASK='ubuntu-live'
# This should be done automatically, but nothing updates
# tasks post-release at the moment.
case $ARCH in
amd64)
add_package live linux-signed-generic-lts-quantal
;;
esac
case $ARCH in
amd64|i386)
KERNEL_FLAVOURS=generic-lts-quantal
;;
esac
;; ;;
kubuntu|kubuntu-dvd) kubuntu|kubuntu-dvd)
@ -143,7 +155,19 @@ case $PROJECT in
edubuntu|edubuntu-dvd) edubuntu|edubuntu-dvd)
add_task install minimal standard edubuntu-desktop-gnome add_task install minimal standard edubuntu-desktop-gnome
LIVE_TASK='edubuntu-live' LIVE_TASK='edubuntu-live'
# This should be done automatically, but nothing updates
# tasks post-release at the moment.
case $ARCH in
amd64)
add_package live linux-signed-generic-lts-quantal
;;
esac
COMPONENTS='main restricted universe' COMPONENTS='main restricted universe'
case $ARCH in
amd64|i386)
KERNEL_FLAVOURS=generic-lts-quantal
;;
esac
;; ;;
xubuntu) xubuntu)
@ -275,6 +299,24 @@ lb config noauto \
--initramfs-compression lzma \ --initramfs-compression lzma \
$OPTS $OPTS
# On some projects/architectures, we want to use backported kernels with
# improved hardware enablement. Unfortunately, live-build doesn't have very
# good support for the way these are laid out: the metapackages are
# *-generic-lts-*, but the files on disk are *-generic. We need some
# contortions to persuade it to do the right thing.
case $KERNEL_FLAVOURS in
*-lts-*)
cat >> config/binary << EOF
case \${0##*/} in
lb_binary*|build)
LB_LINUX_FLAVOURS="$(echo "$KERNEL_FLAVOURS" | sed 's/-lts-[^ ]*//')"
;;
esac
EOF
;;
esac
if $BINARY_REMOVE_LINUX; then if $BINARY_REMOVE_LINUX; then
cat > config/binary_rootfs/excludes << EOF cat > config/binary_rootfs/excludes << EOF
boot/vmlinu?-* boot/vmlinu?-*
@ -296,6 +338,16 @@ case $SUBPROJECT in
;; ;;
esac esac
if [ "$PROPOSED" ]; then
. config/bootstrap
cat > config/archives/proposed.chroot.list << EOF
deb $LB_PARENT_MIRROR_BINARY_VOLATILE $SUITE-proposed $LB_PARENT_ARCHIVE_AREAS
EOF
cp -a config/archives/proposed.chroot.list \
config/archives/proposed.binary.list
fi
case $PROJECT in case $PROJECT in
*-dvd) *-dvd)
. config/bootstrap . config/bootstrap
@ -305,6 +357,11 @@ deb $LB_PARENT_MIRROR_BINARY $SUITE universe multiverse
deb $LB_PARENT_MIRROR_BINARY_SECURITY $SUITE-security universe multiverse deb $LB_PARENT_MIRROR_BINARY_SECURITY $SUITE-security universe multiverse
deb $LB_PARENT_MIRROR_BINARY_VOLATILE $SUITE-updates universe multiverse deb $LB_PARENT_MIRROR_BINARY_VOLATILE $SUITE-updates universe multiverse
EOF EOF
if [ "$PROPOSED" ]; then
cat >> config/archives/dvd.binary.list << EOF
deb $LB_PARENT_MIRROR_BINARY_VOLATILE $SUITE-proposed universe multiverse
EOF
fi
;; ;;
esac esac