Permalink
Browse files

live package is only needed when building casper. The buildHook-Hybri…

…dImage.sh will take care of this.
  • Loading branch information...
1 parent 9dcca9a commit 4f12faf86f13875a81098f9fb252941fc18f65bf @pietheinstrengholt pietheinstrengholt committed Nov 16, 2011
Showing with 5 additions and 15 deletions.
  1. +5 −2 SDK/buildHook-HybridImage.sh
  2. +0 −13 SDK/buildLive/auto/config
@@ -19,8 +19,8 @@
# http://www.gnu.org/copyleft/gpl.html
INITRAMFS=casper
-BOOT_LOADER=grub2
-BINARY_IMAGES=iso
+BOOT_LOADER=syslinux
+BINARY_IMAGES=iso-hybrid
if [ "$INITRAMFS" = "casper" ] ; then
@@ -57,6 +57,9 @@ if [ "$BINARY_IMAGES" = "iso-hybrid" ] ; then
# No grub
sed -i "s/grub-pc/#grub-pc/g" $WORKPATH/buildLive/Files/config/package-lists/packages.list.chroot
rm -rf $WORKPATH/buildLive/Files/config/binary_grub/
+
+ # Add jasper to package list
+ echo "live jasper" >> $WORKPATH/buildLive/Files/config/package-lists/packages.list.chroot
fi
fi
@@ -17,17 +17,6 @@ add_task ()
done
}
-add_package ()
-{
- local pass="$1"
- shift
- local pkg
-
- for pkg; do
- echo "$pkg" >> "config/package-lists/livecd-rootfs.chroot_$pass.list"
- done
-}
-
OPTS=
BINARY_IMAGES=iso
BOOT_LOADER=grub2
@@ -37,8 +26,6 @@ INSTALLER=true
add_task install minimal standard
-add_package live # lupin-casper
-
if [ -n "$APT_HTTP_PROXY" ]; then
OPTS="${OPTS:+$OPTS }--apt-http-proxy $APT_HTTP_PROXY"
fi

0 comments on commit 4f12faf

Please sign in to comment.