Description: Add LliureX hooks to solve LliureX problems Author: Angel Berlanas Vicente Last-Update: 2013-01-07 Index: lb_chroot_preseed =================================================================== --- orig/scripts/build/lb_chroot_preseed (revision 2284) +++ dest/scripts/build/lb_chroot_preseed (working copy) @@ -50,7 +50,8 @@ Install_package # Copying preseed - cp "${PRESEED}" chroot/root/preseed + # LliureX + cp "/usr/share/live/build/preseed/${PRESEED}" chroot/root/preseed Chroot chroot "debconf-set-selections /root/preseed" Index: lb_bootstrap_debootstrap =================================================================== --- orig/scripts/build/lb_bootstrap_debootstrap (revision 2284) +++ dest/scripts/build/lb_bootstrap_debootstrap (working copy) @@ -63,7 +63,7 @@ # Modify archive areas to remove leading/trailing whitespaces and replace other whitepspace with commas DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --components=$(echo ${LB_ARCHIVE_AREAS} | sed -e 's| |,|g')" fi - +# LliureX Fixed if [ -n "${LB_BOOTSTRAP_INCLUDE}" ] then DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --include=$(echo ${LB_BOOTSTRAP_INCLUDE} | sed 's| *|,|g')" @@ -112,9 +112,9 @@ mkdir -p chroot/var/cache/apt/archives cp cache/packages_bootstrap/*.deb chroot/var/cache/apt/archives fi - + # LliureX Echo_breakage "Running debootstrap (download-only)... " - ${LB_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" + ${LB_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --no-check-gpg --download-only "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" if [ -n "${LB_ROOT_COMMAND}" ] then @@ -128,9 +128,9 @@ mkdir -p cache/packages_bootstrap cp chroot/var/cache/apt/archives/*.deb cache/packages_bootstrap fi - + # LliureX Echo_breakage "Running debootstrap... " - ${LB_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" + ${LB_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --no-check-gpg "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" if [ -n "${LB_ROOT_COMMAND}" ] then Index: lb_bootstrap_cdebootstrap =================================================================== --- orig/scripts/build/lb_bootstrap_cdebootstrap (revision 2284) +++ dest/scripts/build/lb_bootstrap_cdebootstrap (working copy) @@ -68,9 +68,10 @@ CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --exclude=$(echo ${LB_BOOTSTRAP_EXCLUDE} | sed 's| *|,|g')" fi +# LliureX if [ -n "${LB_BOOTSTRAP_KEYRING}" ] then - CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --keyring=${LB_BOOTSTRAP_KEYRING}" + CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --keyring=${LB_BOOTSTRAP_KEYRING} --no-check-gpg" fi if [ -z "${LB_BOOTSTRAP_FLAVOUR}" ]