[neon/backports-jammy/debuerreotype/Neon/unstable] /: 0.7-1 (patches unapplied)
git-ubuntu importer
null at kde.org
Fri Aug 11 03:02:00 BST 2023
Git commit ec9aefeed63aa091dc24055dcfed8a00e94c4761 by git-ubuntu importer, on behalf of Tianon Gravi.
Committed on 15/06/2018 at 00:28.
Pushed by carlosdem into branch 'Neon/unstable'.
0.7-1 (patches unapplied)
Imported using git-ubuntu import.
M +11 -11 .travis.yml
M +1 -1 Dockerfile
M +1 -1 README.md
M +1 -1 VERSION
M +2 -1 build.sh
M +12 -0 debian/changelog
M +1 -0 raspbian.sh
M +10 -1 scripts/.slimify-excludes
A +17 -0 scripts/.slimify-includes
M +1 -1 scripts/debuerreotype-init
M +10 -3 scripts/debuerreotype-minimizing-config
M +14 -6 scripts/debuerreotype-slimify
M +1 -0 steamos.sh
M +1 -0 ubuntu.sh
https://invent.kde.org/neon/backports-jammy/debuerreotype/-/commit/ec9aefeed63aa091dc24055dcfed8a00e94c4761
diff --git a/.travis.yml b/.travis.yml
index f74ac80..2456314 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,19 +2,19 @@ language: bash
services: docker
env:
- - SUITE=jessie CODENAME= TIMESTAMP=2017-01-01T00:00:00Z SHA256=29ac0469fb58500a9e02044dbba11f8f583a3fb73e9dafed8cd18bb816e756ed
- - SUITE=stable CODENAME=jessie TIMESTAMP=2017-01-01T00:00:00Z SHA256=29ac0469fb58500a9e02044dbba11f8f583a3fb73e9dafed8cd18bb816e756ed
- - SUITE=stretch CODENAME= TIMESTAMP=2017-01-01T00:00:00Z SHA256=92b3de2c3e349bb4db9de238299ca0423438ff6f021ae44cf4734f19eb4b84c7
- - SUITE=testing CODENAME=stretch TIMESTAMP=2017-01-01T00:00:00Z SHA256=92b3de2c3e349bb4db9de238299ca0423438ff6f021ae44cf4734f19eb4b84c7
- - SUITE=sid CODENAME= TIMESTAMP=2017-01-01T00:00:00Z SHA256=e34b97bfbe21d13aac00e83e2cd8132cfb8e5f4211fe43c229c44766a8722d6b
- - SUITE=unstable CODENAME=sid TIMESTAMP=2017-01-01T00:00:00Z SHA256=e34b97bfbe21d13aac00e83e2cd8132cfb8e5f4211fe43c229c44766a8722d6b
- - SUITE=wheezy CODENAME= TIMESTAMP=2017-01-01T00:00:00Z SHA256=94aac7c0dde96024d3c09d8ed1711b392b415e70f89d36407d27bebd7e8f0a21
- - SUITE=oldstable CODENAME=wheezy TIMESTAMP=2017-01-01T00:00:00Z SHA256=94aac7c0dde96024d3c09d8ed1711b392b415e70f89d36407d27bebd7e8f0a21
+ - SUITE=stable CODENAME=jessie TIMESTAMP=2017-01-01T00:00:00Z SHA256=6b84f7ecfc0e6c399d0673e80c81b7f3d28e8655bede70d13651221e3453a18a
+ - SUITE=jessie CODENAME= TIMESTAMP=2017-01-01T00:00:00Z SHA256=6b84f7ecfc0e6c399d0673e80c81b7f3d28e8655bede70d13651221e3453a18a
+ - SUITE=testing CODENAME=stretch TIMESTAMP=2017-01-01T00:00:00Z SHA256=31f686a39f685a0368839b0681d286d596aa5133cfc5d214210b271300e01b8e
+ - SUITE=stretch CODENAME= TIMESTAMP=2017-01-01T00:00:00Z SHA256=31f686a39f685a0368839b0681d286d596aa5133cfc5d214210b271300e01b8e
+ - SUITE=unstable CODENAME=sid TIMESTAMP=2017-01-01T00:00:00Z SHA256=a10b1a69246d42352f7b30d1de2539b7e478625803b9a7f5302b89401f052379
+ - SUITE=sid CODENAME= TIMESTAMP=2017-01-01T00:00:00Z SHA256=a10b1a69246d42352f7b30d1de2539b7e478625803b9a7f5302b89401f052379
+ - SUITE=oldstable CODENAME=wheezy TIMESTAMP=2017-01-01T00:00:00Z SHA256=15e13bcde2b5cc73664540d5484bbc8a363b824182c0bcf33340b9a72bc546d7
+ - SUITE=wheezy CODENAME= TIMESTAMP=2017-01-01T00:00:00Z SHA256=15e13bcde2b5cc73664540d5484bbc8a363b824182c0bcf33340b9a72bc546d7
# EOL suites testing
- - SUITE=eol CODENAME=etch TIMESTAMP=2016-03-13T13:03:28Z SHA256=82f368d4dd0257603e9091fa3e2511d90cff16188f95414e7b3bff260b927d2d
- - SUITE=eol CODENAME=woody ARCH=i386 TIMESTAMP=2016-03-13T13:03:28Z SHA256=e7db9c0074b2fff8feca7cd273a89ee37275731c409c8c496043f5a1c7ff8d83
+ - SUITE=eol CODENAME=etch TIMESTAMP=2017-01-01T00:00:00Z SHA256=416a70ca3a8375d139c840996d5bbcae7f1e3e8a5cffab98dd6ecb5d9347aa00
+ - SUITE=eol CODENAME=woody ARCH=i386 TIMESTAMP=2017-01-01T00:00:00Z SHA256=36eecde5411e245927745043e3c20651d3ed41c7aad47404d39d1ee97ae80f09
# qemu-debootstrap testing
- - ARCH=arm64 SUITE=jessie CODENAME= TIMESTAMP=2017-01-01T00:00:00Z SHA256=f6f2ba94b0554e5f2485abcb1b36a5b976d7c9c07c7c2af2301c7652274bd797
+ - ARCH=arm64 SUITE=jessie CODENAME= TIMESTAMP=2017-01-01T00:00:00Z SHA256=27daa0fd15340367965e689e75bff4839e63a44cc2db48196b99bc9257bf3277
addons:
apt:
diff --git a/Dockerfile b/Dockerfile
index 41d65e8..6c566d6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-# docker run --cap-add SYS_ADMIN --tmpfs /tmp:dev,exec,suid,noatime ...
+# docker run --cap-add SYS_ADMIN --cap-drop SETFCAP --tmpfs /tmp:dev,exec,suid,noatime ...
# bootstrapping a new architecture?
# ./scripts/debuerreotype-init /tmp/docker-rootfs stretch now
diff --git a/README.md b/README.md
index 8da8691..c6311c3 100644
--- a/README.md
+++ b/README.md
@@ -89,7 +89,7 @@ Processing triggers for libc-bin (2.24-8) ...
$ debuerreotype-gen-sources-list rootfs stretch http://deb.debian.org/debian http://security.debian.org/debian-security
$ debuerreotype-tar rootfs - | sha256sum
-541ccb5b2aa56217141185a3d7eaa5f81549d0191b9452082cf6e29feec6ad35 -
+799e1d60e516d6ba41a17a6cfe7c26c0e5749721efe18f30618e799f41c9cd65 -
$ # try it! you should get that same sha256sum value!
```
diff --git a/VERSION b/VERSION
index 5a2a580..eb49d7c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.6
+0.7
diff --git a/build.sh b/build.sh
index 7b1486a..3315c9e 100755
--- a/build.sh
+++ b/build.sh
@@ -41,6 +41,7 @@ outputDir="$(readlink -f "$outputDir")"
securityArgs=(
--cap-add SYS_ADMIN
+ --cap-drop SETFCAP
)
if docker info | grep -q apparmor; then
# AppArmor blocks mount :)
@@ -153,7 +154,7 @@ docker run \
initArgs+=( --keyring "$keyring" )
releaseSuite="$(awk -F ": " "\$1 == \"Suite\" { print \$2; exit }" "$outputDir/Release")"
- case "$suite" in
+ case "$releaseSuite" in
# see https://bugs.debian.org/src:usrmerge for why merged-usr should not be in stable yet (mostly "dpkg" related bugs)
*oldstable|stable)
initArgs+=( --no-merged-usr )
diff --git a/debian/changelog b/debian/changelog
index 5f9f318..d334397 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+debuerreotype (0.7-1) unstable; urgency=medium
+
+ * Update to 0.7 upstream release; notable PRs:
+ - https://github.com/debuerreotype/debuerreotype/pull/34
+ - https://github.com/debuerreotype/debuerreotype/pull/35
+ (fixes autopkgtests regression with debootstrap 1.0.102)
+ - https://github.com/debuerreotype/debuerreotype/pull/37
+ - https://github.com/debuerreotype/debuerreotype/pull/36
+ - https://github.com/debuerreotype/debuerreotype/pull/38
+
+ -- Tianon Gravi <tianon at debian.org> Thu, 14 Jun 2018 07:37:43 -0700
+
debuerreotype (0.6-1) unstable; urgency=medium
* Update to 0.6 upstream release; notable PRs (since 0.4):
diff --git a/raspbian.sh b/raspbian.sh
index be52765..8c83a55 100755
--- a/raspbian.sh
+++ b/raspbian.sh
@@ -28,6 +28,7 @@ outputDir="$(readlink -f "$outputDir")"
securityArgs=(
--cap-add SYS_ADMIN
+ --cap-drop SETFCAP
)
if docker info | grep -q apparmor; then
# AppArmor blocks mount :)
diff --git a/scripts/.slimify-excludes b/scripts/.slimify-excludes
index 919338f..0b3de88 100644
--- a/scripts/.slimify-excludes
+++ b/scripts/.slimify-excludes
@@ -1,10 +1,19 @@
# This file contains the list of files/directories which will be removed for "slim" image variants.
# https://github.com/tianon/docker-brew-debian/issues/48
+
# https://wiki.ubuntu.com/ReducingDiskFootprint#Drop_unnecessary_files
/usr/share/doc/*
/usr/share/groff/*
/usr/share/info/*
/usr/share/linda/*
-/usr/share/lintian/*
+/usr/share/lintian/overrides/*
/usr/share/locale/*
/usr/share/man/*
+
+# https://anonscm.debian.org/cgit/collab-maint/localepurge.git/tree/usr/share/localepurge/gen-dpkg-cfg.pl?id=b32c8d46d43be2027096f5a202ac789a637ceb39#n9
+/usr/share/locale/*
+/usr/share/gnome/help/*/*
+/usr/share/doc/kde/HTML/*/*
+/usr/share/omf/*/*-*.emf
+
+# see also .slimify-includes
diff --git a/scripts/.slimify-includes b/scripts/.slimify-includes
new file mode 100644
index 0000000..3716cb1
--- /dev/null
+++ b/scripts/.slimify-includes
@@ -0,0 +1,17 @@
+# This file contains the list of files/directories which will *NOT* be removed for "slim" image variants.
+# https://github.com/tianon/docker-brew-debian/issues/48
+
+# https://wiki.ubuntu.com/ReducingDiskFootprint#Drop_unnecessary_files
+/usr/share/doc/*/copyright
+
+# https://anonscm.debian.org/cgit/collab-maint/localepurge.git/tree/usr/share/localepurge/gen-dpkg-cfg.pl?id=b32c8d46d43be2027096f5a202ac789a637ceb39#n9
+/usr/share/locale/locale.alias
+/usr/share/gnome/help/*/C/*
+/usr/share/doc/kde/HTML/C/*
+/usr/share/omf/*/*-C.emf
+/usr/share/locale/languages'
+/usr/share/locale/all_languages'
+/usr/share/locale/currency/*'
+/usr/share/locale/l10n/*
+
+# see also .slimify-excludes
diff --git a/scripts/debuerreotype-init b/scripts/debuerreotype-init
index c08d97a..b44cf91 100755
--- a/scripts/debuerreotype-init
+++ b/scripts/debuerreotype-init
@@ -102,7 +102,7 @@ if [ -n "$minbaseSupported" ]; then
debootstrapArgs+=( --variant=minbase )
fi
-[ -n "$noMergedUsr" ] || debootstrapArgs+=( --merged-usr )
+[ -n "$noMergedUsr" ] && debootstrapArgs+=( --no-merged-usr ) || debootstrapArgs+=( --merged-usr )
[ -z "$keyring" ] || debootstrapArgs+=( --keyring="$keyring" )
[ -z "$arch" ] || debootstrapArgs+=( --arch="$arch" )
[ -z "$include" ] || debootstrapArgs+=( --include="$include" )
diff --git a/scripts/debuerreotype-minimizing-config b/scripts/debuerreotype-minimizing-config
index 4d2eb78..55bc876 100755
--- a/scripts/debuerreotype-minimizing-config
+++ b/scripts/debuerreotype-minimizing-config
@@ -109,16 +109,23 @@ case "$aptVersion" in
cat > "$targetDir/etc/apt/apt.conf.d/docker-gzip-indexes" <<-'EOF'
# Since Docker users using "RUN apt-get update && apt-get install -y ..." in
# their Dockerfiles don't go delete the lists files afterwards, we want them to
- # be as small as possible on-disk, so we explicitly request "gz" versions and
- # tell Apt to keep them gzipped on-disk.
+ # be as small as possible on-disk, so we explicitly request that Apt keep them
+ # compressed on-disk too instead of decompressing them.
# For comparison, an "apt-get update" layer without this on a pristine
# "debian:wheezy" base image was "29.88 MB", where with this it was only
# "8.273 MB".
Acquire::GzipIndexes "true";
- Acquire::CompressionTypes::Order:: "gz";
EOF
+ if [[ "$aptVersion" == 0.* ]] || "$thisDir/debuerreotype-chroot" "$targetDir" dpkg --compare-versions "$aptVersion" '<<' '1.0.9.2~'; then
+ cat >> "$targetDir/etc/apt/apt.conf.d/docker-gzip-indexes" <<-'EOF'
+
+ # https://salsa.debian.org/apt-team/apt/commit/b0f4b486e6850c5f98520ccf19da71d0ed748ae4; released in src:apt 1.0.9.2, 2014-10-02
+ # prior to src:apt 1.0.9.2, "Acquire::GzipIndexes" _only_ applied to gzip-compressed list files, so we need to prefer those on older releases
+ Acquire::CompressionTypes::Order:: "gz";
+ EOF
+ fi
chmod 0644 "$targetDir/etc/apt/apt.conf.d/docker-gzip-indexes"
# remove apt-cache translations for faster "apt-get update"
diff --git a/scripts/debuerreotype-slimify b/scripts/debuerreotype-slimify
index 58e4476..b2ac1b4 100755
--- a/scripts/debuerreotype-slimify
+++ b/scripts/debuerreotype-slimify
@@ -21,6 +21,7 @@ targetDir="${1:-}"; shift || eusage 'missing target-dir'
IFS=$'\n'; set -o noglob
slimExcludes=( $(grep -vE '^#|^$' "$thisDir/.slimify-excludes" | sort -u) )
+slimIncludes=( $(grep -vE '^#|^$' "$thisDir/.slimify-includes" | sort -u) )
set +o noglob; unset IFS
dpkgCfgFile="$targetDir/etc/dpkg/dpkg.cfg.d/docker"
@@ -31,7 +32,13 @@ mkdir -p "$(dirname "$dpkgCfgFile")"
echo '# and this configuration file keeps them that way.'
} > "$dpkgCfgFile"
-neverExclude='/usr/share/doc/*/copyright'
+findMatchIncludes=()
+for slimInclude in "${slimIncludes[@]}"; do
+ [ "${#findMatchIncludes[@]}" -eq 0 ] || findMatchIncludes+=( '-o' )
+ findMatchIncludes+=( -path "$slimInclude" )
+done
+findMatchIncludes=( '(' "${findMatchIncludes[@]}" ')' )
+
for slimExclude in "${slimExcludes[@]}"; do
{
echo
@@ -46,14 +53,14 @@ for slimExclude in "${slimExcludes[@]}"; do
if [[ "$slimExclude" == *'/*' ]]; then
if [ -d "$targetDir/$(dirname "$slimExclude")" ]; then
- # use two passes so that we don't fail trying to remove directories from $neverExclude
+ # use two passes so that we don't fail trying to remove directories from $slimIncludes
# this is our best effort at implementing https://sources.debian.net/src/dpkg/stretch/src/filters.c/#L96-L97 in shell
- # step 1 -- delete everything that doesn't match "$neverExclude" and isn't a directory or a symlink
+ # step 1 -- delete everything that doesn't match "$slimIncludes" and isn't a directory or a symlink
"$thisDir/debuerreotype-chroot" "$targetDir" \
find "$(dirname "$slimExclude")" \
-depth -mindepth 1 \
- -not -path "$neverExclude" \
+ -not "${findMatchIncludes[@]}" \
-not \( -type d -o -type l \) \
-exec rm -f '{}' ';'
@@ -73,7 +80,8 @@ for slimExclude in "${slimExcludes[@]}"; do
done
{
echo
- echo '# always include these files, especially for license compliance'
- echo "path-include $neverExclude"
+ for slimInclude in "${slimIncludes[@]}"; do
+ echo "path-include $slimInclude"
+ done
} >> "$dpkgCfgFile"
chmod 0644 "$dpkgCfgFile"
diff --git a/steamos.sh b/steamos.sh
index 2483581..723446e 100755
--- a/steamos.sh
+++ b/steamos.sh
@@ -28,6 +28,7 @@ outputDir="$(readlink -f "$outputDir")"
securityArgs=(
--cap-add SYS_ADMIN
+ --cap-drop SETFCAP
)
if docker info | grep -q apparmor; then
# AppArmor blocks mount :)
diff --git a/ubuntu.sh b/ubuntu.sh
index cf1d05f..ffaa415 100755
--- a/ubuntu.sh
+++ b/ubuntu.sh
@@ -28,6 +28,7 @@ outputDir="$(readlink -f "$outputDir")"
securityArgs=(
--cap-add SYS_ADMIN
+ --cap-drop SETFCAP
)
if docker info | grep -q apparmor; then
# AppArmor blocks mount :)
More information about the Neon-commits
mailing list