mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-06-13 03:01:43 +00:00
Import patches-unapplied version 0.82 to ubuntu/karmic
Imported using git-ubuntu import. Changelog parent: 812f9e78182c8943c6d0af276978dac4e8bb6729 New changelog entries: [ Loic Minier ] * Default suite is the current one as returned by $(lsb_release -cs); depend on lsb-release (LP: #301963). * Use dpkg --print-architecture as --print-installation-architecture is deprecated. * Don't explicitely install linux-headers-imx51 on armel; all other arches get around this requirement by explicitely seeding the headers in desktop-common which we do as well. [ Colin Watson ] * Remove -nolzma option from mksquashfs, since (a) it's been the default since squashfs 1:3.3-1ubuntu1, and (b) it's no longer available in 4.0.
This commit is contained in:
parent
812f9e7818
commit
4fd04035f3
@ -24,7 +24,7 @@ if [ -n "$SSH_ORIGINAL_COMMAND" ]; then
|
|||||||
[ ${1##*/} != 'BuildLiveCD' ] && echo bad command >&2 && exit 2
|
[ ${1##*/} != 'BuildLiveCD' ] && echo bad command >&2 && exit 2
|
||||||
shift
|
shift
|
||||||
fi
|
fi
|
||||||
ARCH=$(dpkg --print-installation-architecture)
|
ARCH=$(dpkg --print-architecture)
|
||||||
SUBARCH=""
|
SUBARCH=""
|
||||||
SUBARCHARG=""
|
SUBARCHARG=""
|
||||||
DEFAULTSUITE="karmic"
|
DEFAULTSUITE="karmic"
|
||||||
|
17
debian/changelog
vendored
17
debian/changelog
vendored
@ -1,3 +1,20 @@
|
|||||||
|
livecd-rootfs (0.82) karmic; urgency=low
|
||||||
|
|
||||||
|
[ Loic Minier ]
|
||||||
|
* Default suite is the current one as returned by $(lsb_release -cs); depend
|
||||||
|
on lsb-release (LP: #301963).
|
||||||
|
* Use dpkg --print-architecture as --print-installation-architecture is
|
||||||
|
deprecated.
|
||||||
|
* Don't explicitely install linux-headers-imx51 on armel; all other arches
|
||||||
|
get around this requirement by explicitely seeding the headers in
|
||||||
|
desktop-common which we do as well.
|
||||||
|
|
||||||
|
[ Colin Watson ]
|
||||||
|
* Remove -nolzma option from mksquashfs, since (a) it's been the default
|
||||||
|
since squashfs 1:3.3-1ubuntu1, and (b) it's no longer available in 4.0.
|
||||||
|
|
||||||
|
-- Colin Watson <cjwatson@ubuntu.com> Fri, 29 May 2009 09:19:59 +0200
|
||||||
|
|
||||||
livecd-rootfs (0.81) karmic; urgency=low
|
livecd-rootfs (0.81) karmic; urgency=low
|
||||||
|
|
||||||
* ia64 uses -ia64 kernels across the board now.
|
* ia64 uses -ia64 kernels across the board now.
|
||||||
|
2
debian/control
vendored
2
debian/control
vendored
@ -8,7 +8,7 @@ Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk
|
|||||||
|
|
||||||
Package: livecd-rootfs
|
Package: livecd-rootfs
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Depends: debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes
|
Depends: debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes, lsb-release
|
||||||
Suggests: partimage
|
Suggests: partimage
|
||||||
Description: construction script for the livecd rootfs
|
Description: construction script for the livecd rootfs
|
||||||
livecd-rootfs provides the script used to create the root filesystem
|
livecd-rootfs provides the script used to create the root filesystem
|
||||||
|
@ -68,7 +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
|
||||||
ARCH=$(dpkg --print-installation-architecture)
|
ARCH=$(dpkg --print-architecture)
|
||||||
OPTMIRROR=
|
OPTMIRROR=
|
||||||
|
|
||||||
select_mirror () {
|
select_mirror () {
|
||||||
@ -111,7 +111,7 @@ select_mirror () {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
STE=gutsy
|
STE=$(lsb_release -cs)
|
||||||
EXCLUDE=""
|
EXCLUDE=""
|
||||||
LIST=""
|
LIST=""
|
||||||
SUBARCH=""
|
SUBARCH=""
|
||||||
@ -323,7 +323,7 @@ link_in_boot = $link_in_boot
|
|||||||
hppa) LIST="$LIST linux-hppa32 linux-hppa64";;
|
hppa) LIST="$LIST linux-hppa32 linux-hppa64";;
|
||||||
powerpc) LIST="$LIST linux-powerpc linux-powerpc64-smp";;
|
powerpc) LIST="$LIST linux-powerpc linux-powerpc64-smp";;
|
||||||
sparc*) LIST="$LIST linux-sparc64";;
|
sparc*) LIST="$LIST linux-sparc64";;
|
||||||
armel) LIST="$LIST linux-imx51 linux-headers-imx51";;
|
armel) LIST="$LIST linux-imx51";;
|
||||||
*) echo "Unknown architecture: no kernel."; exit 1;;
|
*) echo "Unknown architecture: no kernel."; exit 1;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
@ -554,7 +554,7 @@ ${COMMENT}deb-src ${SECSRCMIRROR} ${STE}-security multiverse
|
|||||||
: > livecd.${FSS}.sort
|
: > livecd.${FSS}.sort
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mksquashfs ${ROOT} livecd.${FSS}.squashfs -nolzma -sort livecd.${FSS}.sort
|
mksquashfs ${ROOT} livecd.${FSS}.squashfs -sort livecd.${FSS}.sort
|
||||||
chmod 644 livecd.${FSS}.squashfs
|
chmod 644 livecd.${FSS}.squashfs
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user