Unverified Commit e4d9516e authored by Daniel Baumann's avatar Daniel Baumann
Browse files

Adding upstream version 20160701.


Signed-off-by: default avatarDaniel Baumann <mail@daniel-baumann.ch>
parent ec12b5af
......@@ -107,6 +107,9 @@ then
XORRISO_OPTIONS="${XORRISO_OPTIONS} -V \"${LB_ISO_VOLUME}\""
fi
# Set an explicit modification date
XORRISO_OPTIONS="${XORRISO_OPTIONS} --modification-date=$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m%d%H%m%S00)"
LB_PRIMARY_BOOTLOADER=$(echo "${LB_BOOTLOADERS}" | awk -F, '{ print $1 }')
# Handle xorriso architecture specific options
......
......@@ -248,7 +248,7 @@ then
_VERSION="$(. chroot/etc/os-release && echo ${VERSION_ID})"
fi
_VERSION="${VERSION:-none}"
_VERSION="${_VERSION:-none}"
_DISTRIBUTION="${LB_DISTRIBUTION}"
_ARCHITECTURE="${LB_ARCHITECTURES}"
......
......@@ -240,13 +240,6 @@ then
done
fi
# Installing aptitude
if [ "${LB_APT}" = "aptitude" ] && [ ! -x chroot/usr/bin/aptitude ]
then
Chroot chroot "apt-get ${APT_OPTIONS} update"
Chroot chroot "apt-get ${APT_OPTIONS} install aptitude"
fi
# Rebuild apt indices from scratch.
# Due to the fact that apt doesn't understand
# pinning on the fly, we need to manually remove
......
......@@ -76,6 +76,12 @@ then
DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --no-check-gpg"
fi
# Include apt-transport-https
if grep '^deb https' config/archives/*.list.*
then
DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --include=apt-transport-https"
fi
if [ -x "/usr/sbin/debootstrap" ]
then
if [ "${LB_CACHE_PACKAGES}" = "true" ]
......
......@@ -64,12 +64,10 @@ case "${1}" in
case "${LB_APT_RECOMMENDS}" in
true)
echo "APT::Install-Recommends \"true\";" > chroot/etc/apt/apt.conf.d/00recommends
echo "Aptitude::Recommends-Important \"true\";" >> chroot/etc/apt/apt.conf.d/00recommends
;;
false)
echo "APT::Install-Recommends \"false\";" > chroot/etc/apt/apt.conf.d/00recommends
echo "Aptitude::Recommends-Important \"false\";" >> chroot/etc/apt/apt.conf.d/00recommends
;;
esac
......@@ -77,12 +75,10 @@ case "${1}" in
case "${LB_APT_SECURE}" in
true)
echo "APT::Get::AllowUnauthenticated \"false\";" > chroot/etc/apt/apt.conf.d/00secure
echo "Aptitude::CmdLine::Ignore-Trust-Violations \"false\";" >> chroot/etc/apt/apt.conf.d/00secure
;;
false)
echo "APT::Get::AllowUnauthenticated \"true\";" > chroot/etc/apt/apt.conf.d/00secure
echo "Aptitude::CmdLine::Ignore-Trust-Violations \"true\";" >> chroot/etc/apt/apt.conf.d/00secure
;;
esac
......@@ -221,22 +217,22 @@ EOF
# Creating lock file
Create_lockfile .lock
# Deconfiguring aptitude ftp proxy
# Deconfiguring apt ftp proxy
rm -f chroot/etc/apt/apt.conf.d/00ftp-proxy
# Deconfiguring aptitude http proxy
# Deconfiguring apt http proxy
rm -f chroot/etc/apt/apt.conf.d/00http-proxy
# Deconfiguring aptitude pipeline
# Deconfiguring apt pipeline
rm -f chroot/etc/apt/apt.conf.d/00pipeline
# Deconfiguring aptitude recommends
# Deconfiguring apt recommends
if [ "${LB_APT_RECOMMENDS}" = "true" ]
then
rm -f chroot/etc/apt/apt.conf.d/00recommends
fi
# Deconfiguring aptitude secure
# Deconfiguring apt secure
if [ "${LB_APT_SECURE}" = "true" ]
then
rm -f chroot/etc/apt/apt.conf.d/00secure
......
......@@ -418,12 +418,6 @@ EOF
then
cp -f cache/indices.bootstrap/*Release* chroot/var/lib/apt/lists
fi
if [ "${LB_APT}" = "aptitude" ] && [ ! -x /usr/bin/aptitude ]
then
Chroot chroot "apt-get ${APT_OPTIONS} update"
Chroot chroot "apt-get ${APT_OPTIONS} install aptitude"
fi
else # Get fresh indices
# Check local archive keys
if Find_files config/archives/*.key || \
......@@ -452,13 +446,6 @@ EOF
done
fi
# Installing aptitude
if [ "${LB_APT}" = "aptitude" ] && [ ! -x /chroot/usr/bin/aptitude ]
then
Chroot chroot "apt-get ${APT_OPTIONS} update"
Chroot chroot "apt-get ${APT_OPTIONS} install aptitude"
fi
# Rebuild apt indices from scratch.
# Due to the fact that apt doesn't understand
# pinning on the fly, we need to manually remove
......
......@@ -80,15 +80,7 @@ then
Restore_cache cache/packages.chroot
# Installing packages
case "${LB_APT}" in
apt|apt-get)
Chroot chroot "xargs --arg-file=/root/packages.chroot apt-get ${APT_OPTIONS} install"
;;
aptitude)
Chroot chroot "xargs --arg-file=/root/packages.chroot aptitude ${APTITUDE_OPTIONS} install"
;;
esac
Chroot chroot "xargs --arg-file=/root/packages.chroot apt-get ${APT_OPTIONS} install"
# Tidying up
rm -f chroot/root/packages.chroot
......
......@@ -72,15 +72,7 @@ esac
# Install live packages
if [ -n "${_PACKAGES}" ]
then
case "${LB_APT}" in
apt|apt-get)
Chroot chroot "apt-get ${APT_OPTIONS} install ${_PACKAGES}"
;;
aptitude)
Chroot chroot "aptitude ${APTITUDE_OPTIONS} install ${_PACKAGES}"
;;
esac
Chroot chroot "apt-get ${APT_OPTIONS} install ${_PACKAGES}"
# Creating stage file
Create_stagefile .build/chroot_live-packages
......
......@@ -16,12 +16,10 @@ set -e
# Setting static variables
PROGRAM="lb config"
DESCRIPTION="$(Echo 'create configuration for live-build(7)')"
USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--apt-ftp-proxy URL]\n\
USAGE="${PROGRAM} [--apt-ftp-proxy URL]\n\
\t [--apt-http-proxy URL]\n\
\t [--apt-indices true|false]\n\
\t [--apt-options OPTION|\"OPTIONS\"]\n\
\t [--aptitude-options OPTION|\"OPTIONS\"]\n\
\t [--apt-pipeline DEPTH]\n\
\t [--apt-recommends true|false]\n\
\t [--apt-secure true|false]\n\
......@@ -113,7 +111,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--firmware-chroot true|false]\n\
\t [--swap-file-path PATH]\n\
\t [--swap-file-size MB]\n\
\t [--tasksel apt|aptitude|tasksel]\n\
\t [--tasksel apt|tasksel]\n\
\t [--updates true|false]\n\
\t [--backports true|false]\n\
\t [--verbose]\n\
......@@ -126,7 +124,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
Local_arguments ()
{
LONG_OPTIONS="apt:,apt-ftp-proxy:,apt-http-proxy:,apt-options:,aptitude-options:,debootstrap-options:,
LONG_OPTIONS="apt:,apt-ftp-proxy:,apt-http-proxy:,apt-options:,debootstrap-options:,
apt-pipeline:,apt-recommends:,apt-secure:,apt-source-archives:,bootstrap:,cache:,cache-indices:,cache-packages:,
cache-stages:,debconf-frontend:,debconf-priority:,dump,
initramfs:,initramfs-compression:,initsystem:,fdisk:,losetup:,mode:,system:,tasksel:,
......@@ -229,11 +227,6 @@ Local_arguments ()
shift 2
;;
--aptitude-options)
APTITUDE_OPTIONS="${2}"
shift 2
;;
--apt-pipeline)
LB_APT_PIPELINE="${2}"
shift 2
......@@ -882,31 +875,27 @@ fi
cat > config/common << EOF
# config/common - common options for live-build(7)
# \$LB_APT: set package manager
# (Default: ${LB_APT})
LB_APT="${LB_APT}"
# \$LB_APT_FTP_PROXY: set apt/aptitude ftp proxy
# \$LB_APT_FTP_PROXY: set apt ftp proxy
# (Default: autodetected or empty)
LB_APT_FTP_PROXY="${LB_APT_FTP_PROXY}"
# \$LB_APT_HTTP_PROXY: set apt/aptitude http proxy
# \$LB_APT_HTTP_PROXY: set apt http proxy
# (Default: autodetected or empty)
LB_APT_HTTP_PROXY="${LB_APT_HTTP_PROXY}"
# \$LB_APT_PIPELINE: set apt/aptitude pipeline depth
# \$LB_APT_PIPELINE: set apt pipeline depth
# (Default: ${LB_APT_PIPELINE})
LB_APT_PIPELINE="${LB_APT_PIPELINE}"
# \$LB_APT_RECOMMENDS: set apt/aptitude recommends
# \$LB_APT_RECOMMENDS: set apt recommends
# (Default: ${LB_APT_RECOMMENDS})
LB_APT_RECOMMENDS="${LB_APT_RECOMMENDS}"
# \$LB_APT_SECURE: set apt/aptitude security
# \$LB_APT_SECURE: set apt security
# (Default: ${LB_APT_SECURE})
LB_APT_SECURE="${LB_APT_SECURE}"
# \$LB_APT_SOURCE_ARCHIVES: set apt/aptitude source entries in sources.list
# \$LB_APT_SOURCE_ARCHIVES: set apt source entries in sources.list
# (Default: ${LB_APT_SOURCE_ARCHIVES})
LB_APT_SOURCE_ARCHIVES="${LB_APT_SOURCE_ARCHIVES}"
......@@ -994,7 +983,6 @@ _QUIET="${_QUIET}"
# Internal stuff (FIXME)
APT_OPTIONS="${APT_OPTIONS}"
APTITUDE_OPTIONS="${APTITUDE_OPTIONS}"
DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS}"
GZIP_OPTIONS="${GZIP_OPTIONS}"
ISOHYBRID_OPTIONS="${ISOHYBRID_OPTIONS}"
......@@ -1139,7 +1127,7 @@ cat > config/binary << EOF
# (Default: ${LB_BINARY_FILESYSTEM})
LB_BINARY_FILESYSTEM="${LB_BINARY_FILESYSTEM}"
# \$LB_APT_INDICES: set apt/aptitude generic indices
# \$LB_APT_INDICES: set apt generic indices
# (Default: ${LB_APT_INDICES})
LB_APT_INDICES="${LB_APT_INDICES}"
......
......@@ -248,7 +248,7 @@ case "${LB_DERIVATIVE}" in
LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="sid"
# Debian Installer daily builds
URL="http://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/"
URL="https://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/"
else
URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/"
fi
......@@ -260,7 +260,7 @@ case "${LB_DERIVATIVE}" in
LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="sid"
# Debian Installer daily builds
URL="http://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/"
URL="https://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/"
else
URL="${LB_PARENT_MIRROR_DEBIAN_INSTALLER}/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/"
fi
......
......@@ -104,7 +104,7 @@ Losetup $FREELO ${LIVE_IMAGE_NAME}-source.img 1
case "${LB_BINARY_FILESYSTEM}" in
ext2|ext3|ext4)
MKFS="${LB_BINARY_FILESYSTEM}"
MKFS_OPTIONS="-L ${LB_HDD_LABEL} -m 0"
MKFS_OPTIONS="-L ${LB_HDD_LABEL} -m 0 -O ^64bit"
MOUNT_OPTIONS=""
;;
......
......@@ -98,6 +98,9 @@ then
XORRISO_OPTIONS="${XORRISO_OPTIONS} -V \"${LB_ISO_VOLUME}\""
fi
# Set an explicit modification date
XORRISO_OPTIONS="${XORRISO_OPTIONS} --modification-date=$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m%d%H%m%S00)"
# Moving image
mv source chroot
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment