mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-08-16 19:24:06 +00:00
Compare commits
6 Commits
ubuntu/mas
...
2.65.3
Author | SHA1 | Date | |
---|---|---|---|
|
1d6aa5d69b | ||
|
d9a0f4cf37 | ||
|
e3a4f1d10f | ||
|
07a3e800b1 | ||
|
5ce5a62908 | ||
|
3524c3f117 |
22
debian/changelog
vendored
22
debian/changelog
vendored
@ -1,3 +1,25 @@
|
|||||||
|
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
|
||||||
|
@ -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"
|
||||||
|
@ -127,6 +127,13 @@ 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
|
||||||
;;
|
;;
|
||||||
|
|
||||||
kubuntu|kubuntu-dvd)
|
kubuntu|kubuntu-dvd)
|
||||||
@ -143,6 +150,13 @@ 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'
|
||||||
;;
|
;;
|
||||||
|
|
||||||
@ -296,6 +310,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 +329,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
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user