Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-06-01 05:01:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Resurrect the proposed option for livecd.sh/BuildLiveCD, so

Browse Source 
we can build test images that include packages from proposed.
* Build with updates and security by default, which is a no-op
  on development releases (where these suites are empty), but
  a necessity for point-release image building.
This commit is contained in:
Adam Conrad 2008-06-10 13:20:23 -06:00
parent a7871085ed
commit f2b39e905d
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
debian/changelog vendored
View File

@ -1,8 +1,16 @@
livecd-rootfs (0.59) UNRELEASED; urgency=low livecd-rootfs (0.59) intrepid; urgency=low
[ Colin Watson ]
* Remove /boot/initrd.img-*.bak (LP: #64887). * Remove /boot/initrd.img-*.bak (LP: #64887).
-- Colin Watson <cjwatson@ubuntu.com> Tue, 06 May 2008 11:58:01 +0100 [ Adam Conrad ]
* Resurrect the proposed option for livecd.sh/BuildLiveCD, so
we can build test images that include packages from proposed.
* Build with updates and security by default, which is a no-op
on development releases (where these suites are empty), but
a necessity for point-release image building.
-- Adam Conrad <adconrad@ubuntu.com> Tue, 10 Jun 2008 13:16:17 -0600
livecd-rootfs (0.58) intrepid; urgency=low livecd-rootfs (0.58) intrepid; urgency=low

27
livecd.sh
View File

@ -112,8 +112,9 @@ STE=gutsy
EXCLUDE="" EXCLUDE=""
LIST="" LIST=""
SUBARCH="" SUBARCH=""
PROPOSED=""
while getopts :d:e:i:I:m:S:s:a: name; do case $name in while getopts :d:e:i:I:m:S:s:a:p name; do case $name in
d) STE=$OPTARG;; d) STE=$OPTARG;;
e) EXCLUDE="$EXCLUDE $OPTARG";; e) EXCLUDE="$EXCLUDE $OPTARG";;
i) LIST="$LIST $OPTARG";; i) LIST="$LIST $OPTARG";;
@ -122,6 +123,7 @@ while getopts :d:e:i:I:m:S:s:a: name; do case $name in
S) USZ="$OPTARG";; S) USZ="$OPTARG";;
s) SUBARCH="$OPTARG";; s) SUBARCH="$OPTARG";;
a) ARCH="$OPTARG";; a) ARCH="$OPTARG";;
p) PROPOSED="yes";;
\?) echo bad usage >&2; exit 2;; \?) echo bad usage >&2; exit 2;;
\:) echo missing argument >&2; exit 2;; \:) echo missing argument >&2; exit 2;;
esac; done; esac; done;
@ -237,7 +239,7 @@ Flags: seen
for file in $DIVERTS; do for file in $DIVERTS; do
mkdir -p ${ROOT}${file%/*} mkdir -p ${ROOT}${file%/*}
chroot $ROOT dpkg-divert --add --local --divert /${file}.livecd --rename /${file} chroot $ROOT dpkg-divert --add --local --divert /${file}.livecd --rename /${file}
cp /bin/true ${ROOT}$file cp ${ROOT}/bin/true ${ROOT}$file
done done
# /bin/true won't cut it for mkinitrd, need to have -o support. # /bin/true won't cut it for mkinitrd, need to have -o support.
@ -303,7 +305,13 @@ link_in_boot = $link_in_boot
# Create a good sources.list, and finish the install # Create a good sources.list, and finish the install
echo deb $MIRROR $STE ${COMP} > ${ROOT}etc/apt/sources.list echo deb $MIRROR $STE ${COMP} > ${ROOT}etc/apt/sources.list
echo deb $MIRROR ${STE}-security ${COMP} >> ${ROOT}etc/apt/sources.list
echo deb $MIRROR ${STE}-updates ${COMP} >> ${ROOT}etc/apt/sources.list
if [ "$PROPOSED" = "yes" ]; then
echo deb $MIRROR ${STE}-proposed ${COMP} >> ${ROOT}etc/apt/sources.list
fi
chroot $ROOT apt-get update chroot $ROOT apt-get update
chroot $ROOT apt-get -y --purge dist-upgrade </dev/null
chroot $ROOT apt-get -y install $LIST </dev/null chroot $ROOT apt-get -y install $LIST </dev/null
chroot ${ROOT} dpkg-query -W --showformat='${Package} ${Version}\n' \ chroot ${ROOT} dpkg-query -W --showformat='${Package} ${Version}\n' \
> livecd.${FSS}.manifest-desktop > livecd.${FSS}.manifest-desktop
@ -339,6 +347,14 @@ link_in_boot = $link_in_boot
deb ${USERMIRROR} $STE ${COMP} deb ${USERMIRROR} $STE ${COMP}
deb-src ${SRCMIRROR} $STE ${COMP} deb-src ${SRCMIRROR} $STE ${COMP}
deb ${SECMIRROR} ${STE}-security ${COMP}
deb-src ${SECSRCMIRROR} ${STE}-security ${COMP}
## Major bug fix updates produced after the final release of the
## distribution.
deb ${USERMIRROR} ${STE}-updates ${COMP}
deb-src ${USERMIRROR} ${STE}-updates ${COMP}
## Uncomment the following two lines to add software from the 'universe' ## Uncomment the following two lines to add software from the 'universe'
## repository. ## repository.
## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
@ -348,9 +364,10 @@ deb-src ${SRCMIRROR} $STE ${COMP}
## team. ## team.
# deb ${USERMIRROR} $STE universe # deb ${USERMIRROR} $STE universe
# deb-src ${SRCMIRROR} $STE universe # deb-src ${SRCMIRROR} $STE universe
# deb ${USERMIRROR} ${STE}-updates universe
deb ${SECMIRROR} ${STE}-security ${COMP} # deb-src ${USERMIRROR} ${STE}-updates universe
deb-src ${SECSRCMIRROR} ${STE}-security ${COMP} # deb ${USERMIRROR} ${STE}-security universe
# deb-src ${USERMIRROR} ${STE}-security universe
@@EOF @@EOF
mv ${ROOT}etc/apt/trusted.gpg.$$ ${ROOT}etc/apt/trusted.gpg mv ${ROOT}etc/apt/trusted.gpg.$$ ${ROOT}etc/apt/trusted.gpg