From 32f8340d434342f8fb035a1c3816e816162197da Mon Sep 17 00:00:00 2001 From: crupest Date: Tue, 21 Nov 2023 17:26:32 +0800 Subject: docker(debian-dev): re-enable sbuild. --- docker/debian-dev/Dockerfile | 5 ++-- docker/debian-dev/bootstrap/home-dot/devscripts | 1 + docker/debian-dev/bootstrap/home-dot/quiltrc-dpkg | 13 +++++++++++ docker/debian-dev/bootstrap/home-dot/sbuildrc | 27 ++++++++++++++++++++++ docker/debian-dev/bootstrap/quiltrc-dpkg | 13 ----------- docker/debian-dev/bootstrap/sbuildrc | 27 ---------------------- docker/debian-dev/bootstrap/setup-dev-tools.bash | 7 ++++-- .../debian-dev/bootstrap/setup-sbuild-amd64.bash | 8 +++++++ .../debian-dev/bootstrap/setup-sbuild-arm64.bash | 6 ++--- docker/debian-dev/bootstrap/setup-sbuild-base.bash | 5 ++++ docker/debian-dev/bootstrap/setup-sbuild.bash | 14 ----------- 11 files changed, 65 insertions(+), 61 deletions(-) create mode 100644 docker/debian-dev/bootstrap/home-dot/devscripts create mode 100644 docker/debian-dev/bootstrap/home-dot/quiltrc-dpkg create mode 100644 docker/debian-dev/bootstrap/home-dot/sbuildrc delete mode 100644 docker/debian-dev/bootstrap/quiltrc-dpkg delete mode 100644 docker/debian-dev/bootstrap/sbuildrc create mode 100755 docker/debian-dev/bootstrap/setup-sbuild-amd64.bash create mode 100755 docker/debian-dev/bootstrap/setup-sbuild-base.bash delete mode 100755 docker/debian-dev/bootstrap/setup-sbuild.bash (limited to 'docker/debian-dev') diff --git a/docker/debian-dev/Dockerfile b/docker/debian-dev/Dockerfile index b2a9c9c..e43764e 100644 --- a/docker/debian-dev/Dockerfile +++ b/docker/debian-dev/Dockerfile @@ -9,8 +9,9 @@ RUN /bootstrap/apt-source/setup.bash RUN /bootstrap/setup-base.bash RUN /bootstrap/setup-dev-tools.bash RUN /bootstrap/setup-dev-tools-arm64.bash -# RUN /bootstrap/setup-sbuild.bash -# RUN /bootstrap/setup-sbuild-arm64.bash +RUN /bootstrap/setup-sbuild-base.bash +RUN /bootstrap/setup-sbuild-amd64.bash +RUN /bootstrap/setup-sbuild-arm64.bash VOLUME [ "/source", "/data" ] CMD [ "bash", "-l" ] diff --git a/docker/debian-dev/bootstrap/home-dot/devscripts b/docker/debian-dev/bootstrap/home-dot/devscripts new file mode 100644 index 0000000..a15b041 --- /dev/null +++ b/docker/debian-dev/bootstrap/home-dot/devscripts @@ -0,0 +1 @@ +export DGET_VERIFY=no \ No newline at end of file diff --git a/docker/debian-dev/bootstrap/home-dot/quiltrc-dpkg b/docker/debian-dev/bootstrap/home-dot/quiltrc-dpkg new file mode 100644 index 0000000..e8fc3c5 --- /dev/null +++ b/docker/debian-dev/bootstrap/home-dot/quiltrc-dpkg @@ -0,0 +1,13 @@ +d=. +while [ ! -d $d/debian -a `readlink -e $d` != / ]; + do d=$d/..; done +if [ -d $d/debian ] && [ -z $QUILT_PATCHES ]; then + # if in Debian packaging tree with unset $QUILT_PATCHES + QUILT_PATCHES="debian/patches" + QUILT_PATCH_OPTS="--reject-format=unified" + QUILT_DIFF_ARGS="-p ab --no-timestamps --no-index --color=auto" + QUILT_REFRESH_ARGS="-p ab --no-timestamps --no-index" + QUILT_COLORS="diff_hdr=1;32:diff_add=1;34:diff_rem=1;31:diff_hunk=1;33:" + QUILT_COLORS="${QUILT_COLORS}diff_ctx=35:diff_cctx=33" + if ! [ -d $d/debian/patches ]; then mkdir $d/debian/patches; fi +fi diff --git a/docker/debian-dev/bootstrap/home-dot/sbuildrc b/docker/debian-dev/bootstrap/home-dot/sbuildrc new file mode 100644 index 0000000..1a9bed4 --- /dev/null +++ b/docker/debian-dev/bootstrap/home-dot/sbuildrc @@ -0,0 +1,27 @@ +############################################################################## +# PACKAGE BUILD RELATED (additionally produce _source.changes) +############################################################################## +$distribution = 'bullseye'; + +$build_arch_all = 1; +$build_arch_any = 1; +$build_source = 0; + +#$source_only_changes = 1; +#$verbose = 1; +#$ENV{'DEB_BUILD_OPTIONS'} = 'parallel=5'; +############################################################################## +# POST-BUILD RELATED (turn off functionality by setting variables to 0) +############################################################################## +$run_lintian = 0; +# $lintian_opts = ['-i', '-I']; +$run_piuparts = 0; +# $piuparts_opts = ['--schroot', '%r-%a-sbuild', '--no-eatmydata']; +$run_autopkgtest = 0; +# $autopkgtest_root_args = ''; +# $autopkgtest_opts = [ '--', 'schroot', '%r-%a-sbuild' ]; + +############################################################################## +# PERL MAGIC +############################################################################## +1; diff --git a/docker/debian-dev/bootstrap/quiltrc-dpkg b/docker/debian-dev/bootstrap/quiltrc-dpkg deleted file mode 100644 index e8fc3c5..0000000 --- a/docker/debian-dev/bootstrap/quiltrc-dpkg +++ /dev/null @@ -1,13 +0,0 @@ -d=. -while [ ! -d $d/debian -a `readlink -e $d` != / ]; - do d=$d/..; done -if [ -d $d/debian ] && [ -z $QUILT_PATCHES ]; then - # if in Debian packaging tree with unset $QUILT_PATCHES - QUILT_PATCHES="debian/patches" - QUILT_PATCH_OPTS="--reject-format=unified" - QUILT_DIFF_ARGS="-p ab --no-timestamps --no-index --color=auto" - QUILT_REFRESH_ARGS="-p ab --no-timestamps --no-index" - QUILT_COLORS="diff_hdr=1;32:diff_add=1;34:diff_rem=1;31:diff_hunk=1;33:" - QUILT_COLORS="${QUILT_COLORS}diff_ctx=35:diff_cctx=33" - if ! [ -d $d/debian/patches ]; then mkdir $d/debian/patches; fi -fi diff --git a/docker/debian-dev/bootstrap/sbuildrc b/docker/debian-dev/bootstrap/sbuildrc deleted file mode 100644 index 1a9bed4..0000000 --- a/docker/debian-dev/bootstrap/sbuildrc +++ /dev/null @@ -1,27 +0,0 @@ -############################################################################## -# PACKAGE BUILD RELATED (additionally produce _source.changes) -############################################################################## -$distribution = 'bullseye'; - -$build_arch_all = 1; -$build_arch_any = 1; -$build_source = 0; - -#$source_only_changes = 1; -#$verbose = 1; -#$ENV{'DEB_BUILD_OPTIONS'} = 'parallel=5'; -############################################################################## -# POST-BUILD RELATED (turn off functionality by setting variables to 0) -############################################################################## -$run_lintian = 0; -# $lintian_opts = ['-i', '-I']; -$run_piuparts = 0; -# $piuparts_opts = ['--schroot', '%r-%a-sbuild', '--no-eatmydata']; -$run_autopkgtest = 0; -# $autopkgtest_root_args = ''; -# $autopkgtest_opts = [ '--', 'schroot', '%r-%a-sbuild' ]; - -############################################################################## -# PERL MAGIC -############################################################################## -1; diff --git a/docker/debian-dev/bootstrap/setup-dev-tools.bash b/docker/debian-dev/bootstrap/setup-dev-tools.bash index 34bae8c..92f59c8 100755 --- a/docker/debian-dev/bootstrap/setup-dev-tools.bash +++ b/docker/debian-dev/bootstrap/setup-dev-tools.bash @@ -6,6 +6,9 @@ apt-get install -y build-essential git devscripts debhelper quilt \ cpio kmod bc python bison flex rsync libelf-dev libssl-dev libncurses-dev dwarves cat /bootstrap/bash-profile/dev.bash >> /root/.bash_profile - -cp /bootstrap/quiltrc-dpkg /root/.quiltrc-dpkg cat /bootstrap/bash-profile/dquilt.bash >> /root/.bash_profile + +for f in /bootstrap/home-dot/*; do + filename=$(basename "$f") + cp "$f" "/root/.$filename" +done diff --git a/docker/debian-dev/bootstrap/setup-sbuild-amd64.bash b/docker/debian-dev/bootstrap/setup-sbuild-amd64.bash new file mode 100755 index 0000000..9ee08d1 --- /dev/null +++ b/docker/debian-dev/bootstrap/setup-sbuild-amd64.bash @@ -0,0 +1,8 @@ +#! /usr/bin/env bash + +set -e + +SBUILD_ARCH="amd64" +SBUILD_DIST="bullseye" + +sbuild-createchroot --include=eatmydata --command-prefix=eatmydata --arch=${SBUILD_ARCH} ${SBUILD_DIST} /srv/chroot/${SBUILD_DIST}-${SBUILD_ARCH}-sbuild "http://$(/bootstrap/apt-source/get-domain.bash)/debian" diff --git a/docker/debian-dev/bootstrap/setup-sbuild-arm64.bash b/docker/debian-dev/bootstrap/setup-sbuild-arm64.bash index b176b14..5feac2d 100755 --- a/docker/debian-dev/bootstrap/setup-sbuild-arm64.bash +++ b/docker/debian-dev/bootstrap/setup-sbuild-arm64.bash @@ -2,7 +2,7 @@ set -e -export SBUILD_ARCH=arm64 - -/bootstrap/setup-sbuild.bash +SBUILD_ARCH="arm64" +SBUILD_DIST="bullseye" +sbuild-createchroot --include=eatmydata --command-prefix=eatmydata --foreign --arch=${SBUILD_ARCH} ${SBUILD_DIST} /srv/chroot/${SBUILD_DIST}-${SBUILD_ARCH}-sbuild "http://$(/bootstrap/apt-source/get-domain.bash)/debian" diff --git a/docker/debian-dev/bootstrap/setup-sbuild-base.bash b/docker/debian-dev/bootstrap/setup-sbuild-base.bash new file mode 100755 index 0000000..a200d3f --- /dev/null +++ b/docker/debian-dev/bootstrap/setup-sbuild-base.bash @@ -0,0 +1,5 @@ +#! /usr/bin/env bash + +set -e + +apt-get install -y sbuild schroot debootstrap diff --git a/docker/debian-dev/bootstrap/setup-sbuild.bash b/docker/debian-dev/bootstrap/setup-sbuild.bash deleted file mode 100755 index f9f1933..0000000 --- a/docker/debian-dev/bootstrap/setup-sbuild.bash +++ /dev/null @@ -1,14 +0,0 @@ -#! /usr/bin/env bash - -set -e - -if [[ -z "${SBUILD_ARCH}" ]]; then - SBUILD_ARCH="amd64" -fi - -apt-get install -y sbuild schroot debootstrap - -cp /bootstrap/sbuildrc /root/.sbuildrc - -sbuild-createchroot --arch=${SBUILD_ARCH} bullseye /srv/chroot/bullseye-${SBUILD_ARCH}-sbuild "https://$(/bootstrap/apt-source/get-domain.bash)/debian" - -- cgit v1.2.3