Import patches-unapplied version 0.97 to ubuntu/karmic

Imported using git-ubuntu import.

Changelog parent: 92501f8656

New changelog entries:
  [ Colin Watson ]
  * Upgrade to debhelper v7.
  [ Loïc Minier ]
  * Make stripping of vmlinuz from livefs optional for uImage subarches where
    we can't use this trick to save space and disable it on armel+dove.
impish
Loïc Minier 16 years ago committed by usd-importer
parent 92501f8656
commit 94f3c2d41c

11
debian/changelog vendored

@ -1,3 +1,14 @@
livecd-rootfs (0.97) karmic; urgency=low
[ Colin Watson ]
* Upgrade to debhelper v7.
[ Loïc Minier ]
* Make stripping of vmlinuz from livefs optional for uImage subarches where
we can't use this trick to save space and disable it on armel+dove.
-- Loïc Minier <loic.minier@ubuntu.com> Wed, 16 Sep 2009 00:52:18 +0200
livecd-rootfs (0.96) karmic; urgency=low
[ Loïc Minier ]

2
debian/compat vendored

@ -1 +1 @@
4
7

4
debian/control vendored

@ -1,14 +1,14 @@
Source: livecd-rootfs
Section: devel
Priority: optional
Build-Depends: debhelper (>=4)
Build-Depends: debhelper (>= 7)
Maintainer: Adam Conrad <adconrad@ubuntu.com>
Standards-Version: 3.6.1.0
Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk
Package: livecd-rootfs
Architecture: all
Depends: debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes, lsb-release
Depends: ${misc:Depends}, debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes, lsb-release
Suggests: partimage
Description: construction script for the livecd rootfs
livecd-rootfs provides the script used to create the root filesystem

2
debian/dirs vendored

@ -1,2 +0,0 @@
usr/sbin
usr/share/doc/livecd-rootfs/examples

1
debian/examples vendored

@ -0,0 +1 @@
BuildLiveCD

1
debian/install vendored

@ -0,0 +1 @@
livecd.sh e2fs-zero.py usr/sbin

81
debian/rules vendored

@ -1,78 +1,3 @@
#!/usr/bin/make -f
# Sample debian/rules that uses debhelper.
# This file is public domain software, originally written by Joey Hess.
# With liberal additions based on debian-installer's rules.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
#ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
#VERS=$(shell LC_ALL=C dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
#CLOOPIMG=livecd-root-${VERS}-${ARCH}.cloopimg
build: build-stamp
build-stamp:
dh_testdir
# Add here commands to compile the package.
#$(MAKE)
touch build-stamp
clean:
dh_testdir
dh_testroot
rm -f build-stamp
# Add here commands to clean up after the build process.
#-$(MAKE) clean
#-$(MAKE) distclean
dh_clean
install: build
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
# Add here commands to install the package into debian/<packagename>
#$(MAKE) prefix=`pwd`/debian/`dh_listpackages`/usr install
install -m755 livecd.sh e2fs-zero.py debian/livecd-rootfs/usr/sbin
install -m644 BuildLiveCD debian/livecd-rootfs/usr/share/doc/livecd-rootfs/examples
# Build architecture-dependent files here.
binary-arch: build install
# We have nothing to do by default.
# Build architecture-independent files here.
binary-indep: build install
dh_testdir
dh_testroot
dh_installchangelogs
dh_installdocs
dh_installexamples
# dh_installmenu
# dh_installdebconf
# dh_installlogrotate
# dh_installemacsen
# dh_installcatalogs
# dh_installpam
# dh_installmime
# dh_installinit
# dh_installcron
# dh_installinfo
# dh_undocumented
dh_installman
dh_link
dh_compress
dh_fixperms
# dh_perl
# dh_python
dh_installdeb
dh_gencontrol
dh_md5sums
dh_builddeb
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
#! /usr/bin/make -f
%:
dh $@

@ -346,6 +346,16 @@ link_in_boot = $link_in_boot
*) echo "Unknown architecture: no kernel."; exit 1;;
esac
# this indicates whether or not to keep /boot/vmlinuz; the default is to
# strip it from the livefs as ubiquity >= 1.9.4 copies the kernel from the
# CD root (/casper/vmlinuz) to the target if it doesn't find one on the
# livefs, allowing us to save space; however some subarches use the uImage
# format and wouldn't save any space so the stripping doesn't make sense
STRIP_VMLINUZ=yes
if [ "$TARGETARCH" = "armel" ] && [ "$SUBARCH" = "dove" ]; then
STRIP_VMLINUZ=no
fi
for x in $EXCLUDE; do
LIST="$(without_package "$x" "$LIST")"
done
@ -509,9 +519,12 @@ ${COMMENT}deb-src ${SECSRCMIRROR} ${STE}-security multiverse
# we mv the initramfs, so it's not wasting space on the livefs
mv ${ROOT}/boot/initrd.img-"${KVER}" livecd.${FSS}.initrd-"${SUBARCH}"
rm -f ${ROOT}/boot/initrd.img-"${KVER}".bak
# ubiquity >= 1.9.4 copies the kernel from the CD root if it doesn't
# find one on the livefs, allowing us to save space
mv ${ROOT}/boot/vmlinu?-"${KVER}" livecd.${FSS}.kernel-"${SUBARCH}"
# whether to strip vmlinuz or not to save space thanks to ubiquity
action="cp"
if [ "$STRIP_VMLINUZ" = "yes" ]; then
action="mv"
fi
$action ${ROOT}/boot/vmlinu?-"${KVER}" livecd.${FSS}.kernel-"${SUBARCH}"
if [ "$INITRD_COMPRESSOR" != gz ]; then
zcat "livecd.${FSS}.initrd-${SUBARCH}" | "$INITRD_COMPRESSOR" -9c \
> "livecd.${FSS}.initrd-${SUBARCH}.new"

Loading…
Cancel
Save