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

Import patches-unapplied version 2.12 to ubuntu/oneiric

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 597d603590653fd4bd7ae259f2090ddd8a68adbe

New changelog entries:
  [ Colin Watson ]
  * Re-enable deb-src lines for Edubuntu (LP: #806428).
This commit is contained in:
Evan Dandrea 2011-07-06 16:57:39 +01:00 committed by usd-importer
parent 597d603590
commit aa826a28b3
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.12) oneiric; urgency=low
[ Colin Watson ]
* Re-enable deb-src lines for Edubuntu (LP: #806428).
-- Evan Dandrea <ev@ubuntu.com> Wed, 06 Jul 2011 16:57:39 +0100
livecd-rootfs (2.11) oneiric; urgency=low livecd-rootfs (2.11) oneiric; urgency=low
* Pass SUBPROJECT to live-build. * Pass SUBPROJECT to live-build.

10
live-build/auto/config
View File

@ -12,7 +12,12 @@ if [ -z "$MIRROR" ]; then
*) MIRROR=http://archive.mmjgroup.com/ubuntu-ports/ ;; *) MIRROR=http://archive.mmjgroup.com/ubuntu-ports/ ;;
esac esac
;; ;;
*.0c3.net) MIRROR=http://ftp.iinet.net.au/linux/ubuntu/ ;; *.0c3.net)
case $ARCH in
i386|amd64) MIRROR=http://mirrors.0c3.net/ubuntu/ ;;
*) MIRROR=http://mirrors.0c3.net/ubuntu-ports/ ;;
esac
;;
*.ubuntu.com) MIRROR=http://ftpmaster.internal/ubuntu/ ;; *.ubuntu.com) MIRROR=http://ftpmaster.internal/ubuntu/ ;;
*.warthogs.hbd.com) MIRROR=http://ftpmaster.internal/ubuntu/ ;; *.warthogs.hbd.com) MIRROR=http://ftpmaster.internal/ubuntu/ ;;
*.buildd) MIRROR=http://ftpmaster.internal/ubuntu/ ;; *.buildd) MIRROR=http://ftpmaster.internal/ubuntu/ ;;
@ -47,6 +52,7 @@ add_package ()
OPTS= OPTS=
COMPONENTS= COMPONENTS=
BINARY_REMOVE_LINUX=: BINARY_REMOVE_LINUX=:
SOURCE='--source false'
LIVE_TASK= LIVE_TASK=
case $IMAGEFORMAT in case $IMAGEFORMAT in
@ -167,7 +173,7 @@ lb config noauto \
--bootstrap-keyring ubuntu-keyring \ --bootstrap-keyring ubuntu-keyring \
--binary-images none \ --binary-images none \
--memtest none \ --memtest none \
--source false \ $SOURCE \
--build-with-chroot false \ --build-with-chroot false \
${MIRROR:+--parent-mirror-bootstrap $MIRROR} \ ${MIRROR:+--parent-mirror-bootstrap $MIRROR} \
${COMPONENTS:+--parent-archive-areas "$COMPONENTS"} \ ${COMPONENTS:+--parent-archive-areas "$COMPONENTS"} \

7
livecd.sh
View File

@ -164,7 +164,12 @@ select_mirror () {
case $(hostname --fqdn) in case $(hostname --fqdn) in
bld-*.mmjgroup.com) MIRROR=${USERMIRROR};; bld-*.mmjgroup.com) MIRROR=${USERMIRROR};;
*.mmjgroup.com) MIRROR=http://archive.mmjgroup.com/${USERMIRROR##*/};; *.mmjgroup.com) MIRROR=http://archive.mmjgroup.com/${USERMIRROR##*/};;
*.0c3.net) MIRROR=http://ftp.iinet.net.au/linux/ubuntu;; *.0c3.net)
case $ARCH in
i386|amd64) MIRROR=http://mirrors.0c3.net/ubuntu/ ;;
*) MIRROR=http://mirrors.0c3.net/ubuntu-ports/ ;;
esac
;;
*.ubuntu.com) MIRROR=http://ftpmaster.internal/ubuntu;; *.ubuntu.com) MIRROR=http://ftpmaster.internal/ubuntu;;
*.warthogs.hbd.com) MIRROR=http://ftpmaster.internal/ubuntu;; *.warthogs.hbd.com) MIRROR=http://ftpmaster.internal/ubuntu;;
*.buildd) MIRROR=http://ftpmaster.internal/ubuntu;; *.buildd) MIRROR=http://ftpmaster.internal/ubuntu;;