From 90b145de6c20829d6d20e7b89ade11e34029f56f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 14 Feb 2011 12:29:25 +0100 Subject: Adding initial support for parent distribution for debian-installer. --- scripts/build/lb_binary_debian-installer | 36 ++++++++++++++++---------------- scripts/build/lb_config | 12 ++++++++++- 2 files changed, 29 insertions(+), 19 deletions(-) (limited to 'scripts/build') diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer index d9b8eeb1c..db1b236fa 100755 --- a/scripts/build/lb_binary_debian-installer +++ b/scripts/build/lb_binary_debian-installer @@ -226,9 +226,9 @@ VMLINUZ_GI="gtk/vmlinuz" INITRD_GI="gtk/initrd.gz" DESTDIR_GI="${DESTDIR}/gtk" -if [ "${LB_DEBIAN_INSTALLER_DISTRIBUTION}" = "daily" ] +if [ "${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}" = "daily" ] then - LB_DEBIAN_INSTALLER_DISTRIBUTION="sid" + LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="sid" # Debian Installer daily builds case "${LB_ARCHITECTURES}" in @@ -262,7 +262,7 @@ then ;; esac else - URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/" + URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/" fi mkdir -p "${DESTDIR_DI}" @@ -473,24 +473,24 @@ then fi # Generating deb indices - mkdir -p binary/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LB_ARCHITECTURES} + mkdir -p binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LB_ARCHITECTURES} mv binary chroot/root - echo "cd /root/binary && apt-ftparchive packages pool/main > dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LB_ARCHITECTURES}/Packages" > chroot/binary.sh + echo "cd /root/binary && apt-ftparchive packages pool/main > dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LB_ARCHITECTURES}/Packages" > chroot/binary.sh Chroot chroot "sh binary.sh" rm -f chroot/binary.sh mv chroot/root/binary ./ - gzip -9 -c binary/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LB_ARCHITECTURES}/Packages > binary/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LB_ARCHITECTURES}/Packages.gz + gzip -9 -c binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LB_ARCHITECTURES}/Packages > binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LB_ARCHITECTURES}/Packages.gz # Fetching release - Download_file binary/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LB_ARCHITECTURES}/Release "${LB_MIRROR_CHROOT}"/dists/"${LB_DEBIAN_INSTALLER_DISTRIBUTION}"/main/binary-"${LB_ARCHITECTURES}"/Release + Download_file binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LB_ARCHITECTURES}/Release "${LB_MIRROR_CHROOT}"/dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/main/binary-"${LB_ARCHITECTURES}"/Release mkdir binary.udeb cd binary.udeb # Downloading udeb indices - Download_file Packages.gz "${LB_MIRROR_CHROOT}"/dists/"${LB_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LB_ARCHITECTURES}"/Packages.gz + Download_file Packages.gz "${LB_MIRROR_CHROOT}"/dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LB_ARCHITECTURES}"/Packages.gz gunzip -c Packages.gz > Packages # Sorting udebs @@ -538,9 +538,9 @@ then fi # Excluding udebs - grep -v "^#" "${LB_BASE}"/data/debian-cd/"${LB_DEBIAN_INSTALLER_DISTRIBUTION}"/udeb_exclude > exclude || true - grep -v "^#" "${LB_BASE}"/data/debian-cd/"${LB_DEBIAN_INSTALLER_DISTRIBUTION}"/exclude-udebs >> exclude || true - grep -v "^#" "${LB_BASE}"/data/debian-cd/"${LB_DEBIAN_INSTALLER_DISTRIBUTION}"/exclude-udebs-${LB_ARCHITECTURES} >> exclude || true + grep -v "^#" "${LB_BASE}"/data/debian-cd/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/udeb_exclude > exclude || true + grep -v "^#" "${LB_BASE}"/data/debian-cd/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/exclude-udebs >> exclude || true + grep -v "^#" "${LB_BASE}"/data/debian-cd/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/exclude-udebs-${LB_ARCHITECTURES} >> exclude || true # Local exclude file if [ -e ../config/binary_debian-installer/udeb_exclude ] @@ -582,17 +582,17 @@ then done # Creating udeb indices - mkdir -p dists/"${LB_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LB_ARCHITECTURES}" + mkdir -p dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LB_ARCHITECTURES}" cd "${OLDPWD}" mv binary.udeb chroot/root - echo "cd /root/binary.udeb && apt-ftparchive packages pool/main > dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURES}/Packages" > chroot/binary.sh + echo "cd /root/binary.udeb && apt-ftparchive packages pool/main > dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURES}/Packages" > chroot/binary.sh Chroot chroot "sh binary.sh" rm -f chroot/binary.sh mv chroot/root/binary.udeb ./ cd binary.udeb - gzip -9 -c dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURES}/Packages > dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURES}/Packages.gz + gzip -9 -c dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURES}/Packages > dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURES}/Packages.gz rm -f Packages* exclude find . | cpio -dmpu "${OLDPWD}"/binary @@ -627,7 +627,7 @@ cd /root/binary && apt-ftparchive \ -o APT::FTPArchive::Release::Architectures="${LB_ARCHITECTURES}" \ -o APT::FTPArchive::Release::Components="main" \ -o APT::FTPArchive::Release::Description="Last updated: $(date -R)" \ - release dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION} > dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/Release + release dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION} > dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/Release EOF Chroot chroot "sh binary.sh" @@ -636,7 +636,7 @@ EOF DISTRIBUTIONS="frozen stable testing unstable" - if [ "${LB_DEBIAN_INSTALLER_DISTRIBUTION}" != "${LB_PARENT_DISTRIBUTION}" ] + if [ "${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}" != "${LB_PARENT_DISTRIBUTION}" ] then DISTRIBUTIONS="${DISTRIBUTIONS} ${LB_PARENT_DISTRIBUTION}" fi @@ -648,7 +648,7 @@ EOF # Creating dist directories for DISTRIBUTION in ${DISTRIBUTIONS} do - cp -a binary/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION} binary/dists/${DISTRIBUTION} + cp -a binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION} binary/dists/${DISTRIBUTION} done ;; esac @@ -658,7 +658,7 @@ EOF # Creating dist symlinks for DISTRIBUTION in ${DISTRIBUTIONS} do - ln -s ${LB_DEBIAN_INSTALLER_DISTRIBUTION} binary/dists/${DISTRIBUTION} + ln -s ${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION} binary/dists/${DISTRIBUTION} done ln -s . binary/debian diff --git a/scripts/build/lb_config b/scripts/build/lb_config index c83cbe048..7b92fe4ec 100755 --- a/scripts/build/lb_config +++ b/scripts/build/lb_config @@ -68,6 +68,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [--debug]\n\ \t [-d|--distribution CODENAME]\n\ \t [--parent-distribution CODENAME]\n\ +\t [--parent-debian-installer-distribution CODENAME]\n\ \t [--dump]\n\ \t [--fdisk fdisk|fdisk.dist]\n\ \t [--force]\n\ @@ -141,7 +142,7 @@ Local_arguments () cache-stages:,debconf-frontend:,debconf-nowarnings:,debconf-priority:,dump, initramfs:,initsystem:,fdisk:,losetup:,mode:,repositories:,root-command:,use-fakeroot:,tasksel:,includes:, templates:,architectures:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,clean, - distribution:,parent-distribution:,mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-chroot-volatile:,mirror-chroot-backports:,mirror-binary:, + distribution:,parent-distribution:,parent-debian-installer-distribution:,mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-chroot-volatile:,mirror-chroot-backports:,mirror-binary:, mirror-binary-security:,mirror-binary-volatile:,mirror-binary-backports:,mirror-debian-installer:,archive-areas:,chroot-filesystem:,exposed-root:,virtual-root-size:, gzip-options:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:, packages:,package-lists:,tasks:,security:,volatile:,backports:,binary-filesystem:,binary-images:, @@ -394,6 +395,11 @@ Local_arguments () shift 2 ;; + --parent-debian-installer-distribution) + LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${2}" + shift 2 + ;; + -m|--mirror-bootstrap) LB_MIRROR_BOOTSTRAP="${2}" shift 2 @@ -983,6 +989,10 @@ LB_DISTRIBUTION="${LB_DISTRIBUTION}" # (Default: ${LB_PARENT_DISTRIBUTION}) LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION}" +# \$LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION: select parent distribution for debian-installer to use +# (Default: ${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}) +LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}" + # \$LB_MIRROR_BOOTSTRAP: set mirror to bootstrap from # (Default: ${LB_MIRROR_BOOTSTRAP}) LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP}" -- cgit v1.2.3