Introduce '--debian-installer-distribution git'.
With this 'distribution', the installer is built from its git repository, matching the date in SOURCE_DATE_EPOCH. Additionally the kernel version is matched to the kernel version in the chroot (to ensure that the installer can be run). Rationale: The 'daily' installers are not archived, and therefore cannot be used for a reproducible build.
This commit is contained in:
Roland Clobus
parent
26845abebc
commit
fa8ebd2469
|
|
@ -86,7 +86,7 @@
|
|||
.br
|
||||
[\fB\-\-debian\-installer\fR cdrom|netinst|netboot|businesscard|live|none]
|
||||
.br
|
||||
[\fB\-\-debian\-installer\-distribution\fR daily|\fICODENAME\fR]
|
||||
[\fB\-\-debian\-installer\-distribution\fR daily|git|\fICODENAME\fR]
|
||||
.br
|
||||
[\fB\-\-debian\-installer\-gui\fR true|false]
|
||||
.br
|
||||
|
|
@ -182,7 +182,7 @@
|
|||
.br
|
||||
[\fB\-\-parent\-archive\-areas\fR \fIARCHIVE_AREA\fR|"\fIARCHIVE_AREAS\fR"]
|
||||
.br
|
||||
[\fB\-\-parent\-debian\-installer\-distribution\fR daily|\fICODENAME\fR]
|
||||
[\fB\-\-parent\-debian\-installer\-distribution\fR daily|git|\fICODENAME\fR]
|
||||
.br
|
||||
[\fB\-\-parent\-distribution\fR \fICODENAME\fR]
|
||||
.br
|
||||
|
|
@ -318,8 +318,8 @@ defines what value the debconf frontend should be set to inside the chroot. Note
|
|||
defines what value the debconf priority should be set to inside the chroot. By default, it is set to critical, which means that almost no questions are displayed. Note that this only has an effect if you use any debconf frontend different from noninteractive.
|
||||
.IP "\fB\-\-debian\-installer\fR cdrom|netinst|netboot|businesscard|live|none" 4
|
||||
defines which type, if any, of the debian\-installer should be included in the resulting binary image. By default, no installer is included. All available flavours except live are the identical configurations used on the installer media produced by regular debian\-cd. When live is chosen, the live\-installer udeb is included so that debian\-installer will behave different than usual \- instead of installing the debian system from packages from the medium or the network, it installs the live system to the disk.
|
||||
.IP "\fB\-\-debian\-installer\-distribution\fR daily|\fICODENAME\fR" 4
|
||||
defines the distribution where the debian\-installer files should be taken out from. Normally, this should be set to the same distribution as the live system. However, sometimes, one wants to use a newer or even daily built installer.
|
||||
.IP "\fB\-\-debian\-installer\-distribution\fR daily|git|\fICODENAME\fR" 4
|
||||
defines the distribution where the debian\-installer files should be taken out from. Normally, this should be set to the same distribution as the live system. However, sometimes, one wants to use a newer or even either the \fIdaily\fR built installer or the installer rebuilt from its \fIgit\fR repository.
|
||||
.IP "\fB\-\-debian\-installer\-gui\fR true|false" 4
|
||||
defines whether the graphical version of the debian\-installer should be provided alongside the text based one. This defaults to true.
|
||||
.IP "\fB\-\-debian\-installer\-preseedfile\fR \fIFILE\fR|\fIURL\fR" 4
|
||||
|
|
@ -414,7 +414,7 @@ defines if an ONIE.bin image is generated. ONIE binaries can be loaded by suppor
|
|||
defines additional kernel command line options that the ONIE system will use when booting the image. Default is empty string.
|
||||
.IP "\fB\-\-parent\-archive\-areas\fR \fIARCHIVE_AREA\fR|""\fIARCHIVE_AREAS\fR""" 4
|
||||
defines the archive areas for derivatives of the resulting live system (a comma or space separated list).
|
||||
.IP "\fB\-\-parent\-debian\-installer\-distribution\fR daily|\fICODENAME\fR" 4
|
||||
.IP "\fB\-\-parent\-debian\-installer\-distribution\fR daily|git|\fICODENAME\fR" 4
|
||||
defines the parent debian\-installer distribution for derivatives of the resulting live system.
|
||||
.IP "\fB\-\-parent\-distribution\fR \fICODENAME\fR" 4
|
||||
defines the parent distribution for derivatives of the resulting live system.
|
||||
|
|
|
|||
|
|
@ -39,9 +39,36 @@ Check_stagefile
|
|||
# Acquire lock file
|
||||
Acquire_lockfile
|
||||
|
||||
# Set d-i image type
|
||||
case "${LB_DEBIAN_INSTALLER}" in
|
||||
businesscard|netboot|netinst)
|
||||
DI_IMAGE_TYPE="netboot"
|
||||
;;
|
||||
*)
|
||||
case "${LB_IMAGE_TYPE}" in
|
||||
netboot)
|
||||
DI_IMAGE_TYPE="netboot"
|
||||
;;
|
||||
|
||||
*)
|
||||
DI_IMAGE_TYPE="cdrom"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
|
||||
# Checking depends
|
||||
Check_package host /usr/bin/wget wget
|
||||
Check_package chroot /usr/bin/apt-ftparchive apt-utils
|
||||
if [ "${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}" = "git" -a "${DI_IMAGE_TYPE}" = "cdrom" ]
|
||||
then
|
||||
# Packages that are needed for rebuilding the debian installer
|
||||
Check_package chroot /lib/module linux-image-generic
|
||||
Check_package chroot /usr/bin/git git
|
||||
Check_package chroot /usr/bin/mk-build-deps devscripts
|
||||
Check_package chroot /usr/bin/equivs-build equivs
|
||||
Check_package chroot /usr/bin/gcc gcc
|
||||
fi
|
||||
|
||||
# Restoring cache
|
||||
Restore_package_cache binary
|
||||
|
|
@ -70,24 +97,6 @@ case "${LB_IMAGE_TYPE}" in
|
|||
;;
|
||||
esac
|
||||
|
||||
# Set d-i image type
|
||||
case "${LB_DEBIAN_INSTALLER}" in
|
||||
businesscard|netboot|netinst)
|
||||
DI_IMAGE_TYPE="netboot"
|
||||
;;
|
||||
*)
|
||||
case "${LB_IMAGE_TYPE}" in
|
||||
netboot)
|
||||
DI_IMAGE_TYPE="netboot"
|
||||
;;
|
||||
|
||||
*)
|
||||
DI_IMAGE_TYPE="cdrom"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
|
||||
# Set architecture-specific variables
|
||||
case "${LB_ARCHITECTURE}" in
|
||||
armel)
|
||||
|
|
@ -185,6 +194,14 @@ Install_file() {
|
|||
# from a non-standard cwd.
|
||||
_LB_CACHE_DIR="$(pwd)/cache/installer_debian-installer"
|
||||
|
||||
Prepare_installer_cache() {
|
||||
local SRC_FILENAME="${1}"
|
||||
local DEST_FILENAME="${_LB_CACHE_DIR}/$(echo "${URL}/${SRC_FILENAME}" | sed 's|/|_|g')"
|
||||
|
||||
mkdir -p $(dirname ${DEST_FILENAME})
|
||||
cp -a chroot/debian-installer/build/dest/${SRC_FILENAME} ${DEST_FILENAME}
|
||||
}
|
||||
|
||||
Download_file () {
|
||||
local _LB_TARGET="${1}"
|
||||
local _LB_URL="${2}"
|
||||
|
|
@ -243,7 +260,57 @@ case "${LB_DERIVATIVE}" in
|
|||
;;
|
||||
|
||||
false)
|
||||
if [ "${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}" = "daily" ]
|
||||
if [ "${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}" = "git" -a "${DI_IMAGE_TYPE}" = "cdrom" ]
|
||||
then
|
||||
LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DISTRIBUTION_CHROOT}"
|
||||
URL="${LB_PARENT_MIRROR_CHROOT}/snapshot-build_${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}_${LB_ARCHITECTURE}"
|
||||
# These variables do not need to be passed inside the chroot, they can be resolved earlier:
|
||||
# SOURCE_DATE_EPOCH, _QUIET, LB_PARENT_MIRROR_CHROOT, LB_PARENT_DISTRIBUTION_CHROOT
|
||||
cat << EOF > chroot/buildit.sh
|
||||
#!/bin/sh
|
||||
# Get the version of the git repo that matches SOURCE_DATE_EPOCH
|
||||
DEBIAN_INSTALLER=/debian-installer
|
||||
mkdir -p \${DEBIAN_INSTALLER}
|
||||
git clone https://salsa.debian.org/installer-team/debian-installer.git \${DEBIAN_INSTALLER} --single-branch --no-tags --quiet
|
||||
cd \${DEBIAN_INSTALLER}
|
||||
git checkout \$(git rev-list -n 1 --min-age=${SOURCE_DATE_EPOCH} HEAD) --quiet
|
||||
if [ "${_QUIET}" != "true" ]
|
||||
then
|
||||
echo "P: using debian-installer from git version \$(git log -n 1 --pretty=format:%H_%aI)"
|
||||
fi
|
||||
|
||||
# Install the build-dependencies
|
||||
mk-build-deps
|
||||
find -maxdepth 1 -name *.deb | xargs apt-get --yes install
|
||||
|
||||
# Build the installer
|
||||
cd build
|
||||
if [ "${_QUIET}" != "true" ]
|
||||
then
|
||||
echo "P: building the debian-installer"
|
||||
fi
|
||||
# LINUX_KERNEL_ABI -> use the version of the kernel that matches the current kernel, independent of the version in the git repo (config/common)
|
||||
# Output of dpkg-query:
|
||||
# ii linux-image-5.17.0-1-amd64
|
||||
# un linux-image-5.17.0-1-amd64-unsigned
|
||||
# ii linux-image-amd64
|
||||
# un linux-image-generic
|
||||
# -> extract the 5.17.0-1 for LINUX_KERNEL_ABI
|
||||
# MIRROR -> our snapshot URL, with disabled expiration
|
||||
# TARGETS -> only these targets are required
|
||||
# USE_UDEBS_FROM -> use the same distribution as the chroot
|
||||
export LINUX_KERNEL_ABI=\$(dpkg-query --showformat "\\\${db:Status-Abbrev} \\\${Package}\n" --show linux-image-* | awk '\$1=="ii" { c = split(\$2, a, "-"); if (c>4) { print a[3] "-" a[4] } }')
|
||||
MIRROR="[check-valid-until=no] ${LB_PARENT_MIRROR_CHROOT}" TARGETS="build_cdrom_gtk build_cdrom_isolinux" USE_UDEBS_FROM=${LB_PARENT_DISTRIBUTION_CHROOT} bash ./daily-build build-only
|
||||
EOF
|
||||
Chroot chroot "sh buildit.sh"
|
||||
# Place the files in the cache. Download_file will use the cache instead of downloading
|
||||
Prepare_installer_cache cdrom/"${VMLINUZ_DI}"
|
||||
Prepare_installer_cache cdrom/"${INITRD_DI}"
|
||||
Prepare_installer_cache cdrom/"${VMLINUZ_GI}"
|
||||
Prepare_installer_cache cdrom/"${INITRD_GI}"
|
||||
rm -rf chroot/debian-installer
|
||||
rm -f chroot/buildit.sh
|
||||
elif [ "${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}" = "daily" ]
|
||||
then
|
||||
LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="sid"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue