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

Rename EXTRASOURCE to PPA and also define PPAMIRROR near top, set to

Browse Source 
ppa.launchpad.net.  Changing to PPA avoids listing non-main components in
deb lines and having an useful comment in sources.list.
This commit is contained in:
Loïc Minier 2009-10-01 23:47:16 +02:00
parent d5878b01be
commit bca8c7f54f
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -5,6 +5,9 @@ livecd-rootfs (0.99) UNRELEASED; urgency=low
dir and hence would mask the previous builds; and even if that would be dir and hence would mask the previous builds; and even if that would be
fixed, arch-indepedent filenames such as manifest/kernel/initrd/etc. fixed, arch-indepedent filenames such as manifest/kernel/initrd/etc.
symlinks would clash. symlinks would clash.
* Rename EXTRASOURCE to PPA and also define PPAMIRROR near top, set to
ppa.launchpad.net. Changing to PPA avoids listing non-main components in
deb lines and having an useful comment in sources.list.
-- Loïc Minier <loic.minier@ubuntu.com> Thu, 24 Sep 2009 11:52:25 +0200 -- Loïc Minier <loic.minier@ubuntu.com> Thu, 24 Sep 2009 11:52:25 +0200

19
livecd.sh
View File

@ -68,6 +68,7 @@ export DEBIAN_FRONTEND=noninteractive
export LANG=C export LANG=C
export CASPER_GENERATE_UUID=1 export CASPER_GENERATE_UUID=1
SRCMIRROR=http://archive.ubuntu.com/ubuntu SRCMIRROR=http://archive.ubuntu.com/ubuntu
PPAMIRROR=ppa.launchpad.net
ARCH=$(dpkg --print-architecture) ARCH=$(dpkg --print-architecture)
OPTMIRROR= OPTMIRROR=
INITRD_COMPRESSOR=lzma INITRD_COMPRESSOR=lzma
@ -117,7 +118,7 @@ EXCLUDE=""
LIST="" LIST=""
SUBARCH="" SUBARCH=""
PROPOSED="" PROPOSED=""
EXTRASOURCE="" PPA=""
while getopts :d:e:i:I:m:S:s:a:p 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;;
@ -221,7 +222,7 @@ Flags: seen
LIST="$LIST minimal^ ubuntu-moblin-remix" LIST="$LIST minimal^ ubuntu-moblin-remix"
LIVELIST="ubuntu-moblin-live" LIVELIST="ubuntu-moblin-live"
COMP="main restricted universe" COMP="main restricted universe"
EXTRASOURCE="http://ppa.launchpad.net/moblin/ppa/ubuntu/" PPA="moblin/ppa"
;; ;;
base) base)
LIST="$LIST minimal^ standard^" LIST="$LIST minimal^ standard^"
@ -379,8 +380,8 @@ Pin-Priority: 900
if [ "$PROPOSED" = "yes" ]; then if [ "$PROPOSED" = "yes" ]; then
echo deb $MIRROR ${STE}-proposed ${COMP} >> ${ROOT}etc/apt/sources.list echo deb $MIRROR ${STE}-proposed ${COMP} >> ${ROOT}etc/apt/sources.list
fi fi
if [ -n "$EXTRASOURCE" ]; then if [ -n "$PPA" ]; then
echo deb $EXTRASOURCE $STE ${COMP} >> ${ROOT}etc/apt/sources.list echo deb http://$PPAMIRROR/$PPA/ubuntu ${STE} main >> ${ROOT}etc/apt/sources.list
fi fi
chroot $ROOT apt-get update chroot $ROOT apt-get update
if [ "$FS" = "ubuntu-moblin-remix" ]; then if [ "$FS" = "ubuntu-moblin-remix" ]; then
@ -491,8 +492,14 @@ ${COMMENT}deb-src ${SRCMIRROR} ${STE}-updates multiverse
${COMMENT}deb ${SECMIRROR} ${STE}-security multiverse ${COMMENT}deb ${SECMIRROR} ${STE}-security multiverse
${COMMENT}deb-src ${SECSRCMIRROR} ${STE}-security multiverse ${COMMENT}deb-src ${SECSRCMIRROR} ${STE}-security multiverse
@@EOF @@EOF
if [ -n "$EXTRASOURCE" ]; then if [ -n "$PPA" ]; then
echo deb $EXTRASOURCE $STE ${COMP} >> ${ROOT}etc/apt/sources.list cat << @@EOF >> ${ROOT}etc/apt/sources.list
## The following unsupported and untrusted Personal Archives (PPAs) were used
## to create the base image of this system
deb http://$PPAMIRROR/$PPA/ubuntu ${STE} main
deb-src http://$PPAMIRROR/$PPA/ubuntu ${STE} main
@@EOF
fi fi
mv ${ROOT}etc/apt/trusted.gpg.$$ ${ROOT}etc/apt/trusted.gpg mv ${ROOT}etc/apt/trusted.gpg.$$ ${ROOT}etc/apt/trusted.gpg