Skip to content

Commit

Permalink
Merge pull request #1085 from minimum2scp/features/no-merged-usr_sid
Browse files Browse the repository at this point in the history 
debian, baseimage: usr-merge
  • Loading branch information
@minimum2scp
minimum2scp authored Sep 17, 2023
2 parents b26922e + 247224a commit a7674ee
Show file tree
Hide file tree
Showing 7 changed files with 78 additions and 88 deletions.
20 changes: 10 additions & 10 deletions baseimage/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ installed packages:

```
ii adduser 3.137 all add and remove users and groups
ii apt 2.7.3 amd64 commandline package manager
ii apt 2.7.5 amd64 commandline package manager
ii base-files 13 amd64 Debian base system miscellaneous files
ii base-passwd 3.6.1 amd64 Debian base system master password and group files
ii bash 5.2.15-2+b4 amd64 GNU Bourne Again SHell
ii bash 5.2.15-2+b5 amd64 GNU Bourne Again SHell
ii bsdextrautils 2.39.2-1 amd64 extra utilities from 4.4BSD-Lite
ii bsdutils 1:2.39.2-1 amd64 basic utilities from 4.4BSD-Lite
ii bzip2 1.0.8-5+b1 amd64 high-quality block-sorting file compressor - utilities
Expand Down Expand Up @@ -94,17 +94,17 @@ ii init-system-helpers 1.65.2 all helper
ii initscripts 3.07-1 all scripts for initializing and shutting down the system
ii insserv 1.24.0-1 amd64 boot sequence organizer using LSB init.d script dependency information
ii libacl1 2.3.1-3 amd64 access control list - shared library
ii libapt-pkg6.0 2.7.3 amd64 package management runtime library
ii libapt-pkg6.0 2.7.5 amd64 package management runtime library
ii libattr1 1:2.5.1-4 amd64 extended attribute handling - shared library
ii libaudit-common 1:3.1.1-1 all Dynamic library for security auditing - common files
ii libaudit1 1:3.1.1-1 amd64 Dynamic library for security auditing
ii libblkid1 2.39.2-1 amd64 block device ID library
ii libbrotli1 1.0.9-2+b6 amd64 library implementing brotli encoder and decoder (shared libraries)
ii libbsd0 0.11.7-4 amd64 utility functions from BSD systems - shared library
ii libbz2-1.0 1.0.8-5+b1 amd64 high-quality block-sorting file compressor library - runtime
ii libc-bin 2.37-9 amd64 GNU C Library: Binaries
ii libc-l10n 2.37-9 all GNU C Library: localization files
ii libc6 2.37-9 amd64 GNU C Library: Shared libraries
ii libc-bin 2.37-10 amd64 GNU C Library: Binaries
ii libc-l10n 2.37-10 all GNU C Library: localization files
ii libc6 2.37-10 amd64 GNU C Library: Shared libraries
ii libcap-ng0 0.8.3-1+b3 amd64 alternate POSIX capabilities library
ii libcap2 1:2.66-4 amd64 POSIX 1003.1e capabilities (library)
ii libcbor0.10 0.10.2-1 amd64 library for parsing and generating CBOR (RFC 7049)
Expand Down Expand Up @@ -172,20 +172,20 @@ ii libss2 1.47.0-2+b1 amd64 command
ii libssh2-1 1.11.0-2 amd64 SSH2 client-side library
ii libssl3 3.0.10-1 amd64 Secure Sockets Layer toolkit - shared libraries
ii libstdc++6 13.2.0-4 amd64 GNU Standard C++ Library v3
ii libsystemd0 254.1-3 amd64 systemd utility library
ii libsystemd0 254.3-1 amd64 systemd utility library
ii libtasn1-6 4.19.0-3 amd64 Manage ASN.1 structures (runtime)
ii libtinfo6 6.4+20230625-2 amd64 shared low-level terminfo library for terminal handling
ii libtirpc-common 1.3.3+ds-1 all transport-independent RPC library - common files
ii libtirpc3 1.3.3+ds-1 amd64 transport-independent RPC library
ii libuchardet0 0.0.7-1 amd64 universal charset detection library - shared library
ii libudev1 254.1-3 amd64 libudev shared library
ii libudev1 254.3-1 amd64 libudev shared library
ii libunistring5 1.1-2 amd64 Unicode string library for C
ii libuuid1 2.39.2-1 amd64 Universally Unique ID library
ii libwrap0 7.6.q-32 amd64 Wietse Venema's TCP wrappers library
ii libxxhash0 0.8.2-2 amd64 shared library for xxhash
ii libzstd1 1.5.5+dfsg2-1 amd64 fast lossless compression algorithm
ii localepurge 0.7.3.10 all reclaim disk space by removing unneeded localizations
ii locales 2.37-9 all GNU C Library: National Language (locale) data [support]
ii locales 2.37-10 all GNU C Library: National Language (locale) data [support]
ii login 1:4.13+dfsg1-1+b1 amd64 system login tools
ii logsave 1.47.0-2+b1 amd64 save the output of a command in a log file
ii lv 4.51-9 amd64 Powerful Multilingual File Viewer
Expand All @@ -211,7 +211,7 @@ ii sed 4.9-1 amd64 GNU str
ii sensible-utils 0.0.20 all Utilities for sensible alternative selection
ii startpar 0.65-1+b1 amd64 run processes in parallel and multiplex their output
ii sudo 1.9.14p2-1 amd64 Provide limited super user privileges to specific users
ii systemd-standalone-sysusers 254.1-3 amd64 standalone sysusers binary for use in non-systemd systems
ii systemd-standalone-sysusers 254.3-1 amd64 standalone sysusers binary for use in non-systemd systems
ii sysv-rc 3.07-1 all System-V-like runlevel change mechanism
ii sysvinit-core 3.07-1 amd64 System-V-like init
ii sysvinit-utils 3.07-1 amd64 System-V-like utilities
Expand Down
58 changes: 29 additions & 29 deletions baseimage/debian-packages.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,29 +31,29 @@
"Architecture": "amd64",
"Conflicts": "",
"Breaks": "apt-transport-https (<< 1.5~alpha4~), apt-utils (<< 1.3~exp2~), aptitude (<< 0.8.10)",
"Depends": "base-passwd (>= 3.6.1) | adduser, gpgv | gpgv2 | gpgv1, libapt-pkg6.0 (>= 2.7.3), debian-archive-keyring, libc6 (>= 2.34), libgcc-s1 (>= 3.0), libgnutls30 (>= 3.7.5), libseccomp2 (>= 2.4.2), libstdc++6 (>= 13.1), libsystemd0",
"Depends": "base-passwd (>= 3.6.1) | adduser, gpgv, libapt-pkg6.0 (>= 2.7.5), debian-archive-keyring, libc6 (>= 2.34), libgcc-s1 (>= 3.0), libgnutls30 (>= 3.8.1), libseccomp2 (>= 2.4.2), libstdc++6 (>= 13.1), libsystemd0",
"Enhances": "",
"Essential": "no",
"Installed-Size": "4302",
"Installed-Size": "4318",
"Origin": "",
"Package": "apt",
"Pre-Depends": "",
"Priority": "required",
"Provides": "apt-transport-https (= 2.7.3)",
"Provides": "apt-transport-https (= 2.7.5)",
"Recommends": "ca-certificates",
"Replace": "",
"Section": "admin",
"Status": "install ok installed",
"Suggests": "apt-doc, aptitude | synaptic | wajig, dpkg-dev (>= 1.17.2), gnupg | gnupg2 | gnupg1, powermgmt-base",
"Version": "2.7.3",
"Version": "2.7.5",
"binary:Package": "apt",
"binary:Summary": "commandline package manager",
"db:Status-Abbrev": "ii ",
"db:Status-Want": "install",
"db:Status-Status": "installed",
"db:Status-Eflag": "ok",
"source:Package": "apt",
"source:Version": "2.7.3"
"source:Version": "2.7.5"
},
{
"Architecture": "amd64",
Expand Down Expand Up @@ -118,7 +118,7 @@
"Depends": "base-files (>= 2.1.12), debianutils (>= 5.6-0.1)",
"Enhances": "",
"Essential": "yes",
"Installed-Size": "7168",
"Installed-Size": "7176",
"Origin": "",
"Package": "bash",
"Pre-Depends": "libc6 (>= 2.36), libtinfo6 (>= 6)",
Expand All @@ -129,7 +129,7 @@
"Section": "shells",
"Status": "install ok installed",
"Suggests": "bash-doc",
"Version": "5.2.15-2+b4",
"Version": "5.2.15-2+b5",
"binary:Package": "bash",
"binary:Summary": "GNU Bourne Again SHell",
"db:Status-Abbrev": "ii ",
Expand Down Expand Up @@ -958,26 +958,26 @@
"Depends": "libbz2-1.0, libc6 (>= 2.34), libgcc-s1 (>= 3.0), libgcrypt20 (>= 1.10.0), liblz4-1 (>= 0.0~r127), liblzma5 (>= 5.1.1alpha+20120614), libstdc++6 (>= 13.1), libsystemd0 (>= 221), libudev1 (>= 183), libxxhash0 (>= 0.7.1), libzstd1 (>= 1.5.5), zlib1g (>= 1:1.2.2.3)",
"Enhances": "",
"Essential": "no",
"Installed-Size": "3438",
"Installed-Size": "3463",
"Origin": "",
"Package": "libapt-pkg6.0",
"Pre-Depends": "",
"Priority": "optional",
"Provides": "libapt-pkg (= 2.7.3)",
"Recommends": "apt (>= 2.7.3)",
"Provides": "libapt-pkg (= 2.7.5)",
"Recommends": "apt (>= 2.7.5)",
"Replace": "",
"Section": "libs",
"Status": "install ok installed",
"Suggests": "",
"Version": "2.7.3",
"Version": "2.7.5",
"binary:Package": "libapt-pkg6.0:amd64",
"binary:Summary": "package management runtime library",
"db:Status-Abbrev": "ii ",
"db:Status-Want": "install",
"db:Status-Status": "installed",
"db:Status-Eflag": "ok",
"source:Package": "apt",
"source:Version": "2.7.3"
"source:Version": "2.7.5"
},
{
"Architecture": "amd64",
Expand Down Expand Up @@ -1193,15 +1193,15 @@
"Section": "libs",
"Status": "install ok installed",
"Suggests": "",
"Version": "2.37-9",
"Version": "2.37-10",
"binary:Package": "libc-bin",
"binary:Summary": "GNU C Library: Binaries",
"db:Status-Abbrev": "ii ",
"db:Status-Want": "install",
"db:Status-Status": "installed",
"db:Status-Eflag": "ok",
"source:Package": "glibc",
"source:Version": "2.37-9"
"source:Version": "2.37-10"
},
{
"Architecture": "all",
Expand All @@ -1221,15 +1221,15 @@
"Section": "localization",
"Status": "install ok installed",
"Suggests": "",
"Version": "2.37-9",
"Version": "2.37-10",
"binary:Package": "libc-l10n",
"binary:Summary": "GNU C Library: localization files",
"db:Status-Abbrev": "ii ",
"db:Status-Want": "install",
"db:Status-Status": "installed",
"db:Status-Eflag": "ok",
"source:Package": "glibc",
"source:Version": "2.37-9"
"source:Version": "2.37-10"
},
{
"Architecture": "amd64",
Expand All @@ -1249,15 +1249,15 @@
"Section": "libs",
"Status": "install ok installed",
"Suggests": "glibc-doc, debconf | debconf-2.0, libc-l10n, locales, libnss-nis, libnss-nisplus",
"Version": "2.37-9",
"Version": "2.37-10",
"binary:Package": "libc6:amd64",
"binary:Summary": "GNU C Library: Shared libraries",
"db:Status-Abbrev": "ii ",
"db:Status-Want": "install",
"db:Status-Status": "installed",
"db:Status-Eflag": "ok",
"source:Package": "glibc",
"source:Version": "2.37-9"
"source:Version": "2.37-10"
},
{
"Architecture": "amd64",
Expand Down Expand Up @@ -3142,7 +3142,7 @@
"Depends": "libc6 (>= 2.35), libcap2 (>= 1:2.10), libgcrypt20 (>= 1.10.0), liblz4-1 (>= 0.0~r122), liblzma5 (>= 5.1.1alpha+20120614), libzstd1 (>= 1.5.5)",
"Enhances": "",
"Essential": "no",
"Installed-Size": "968",
"Installed-Size": "980",
"Origin": "",
"Package": "libsystemd0",
"Pre-Depends": "",
Expand All @@ -3153,15 +3153,15 @@
"Section": "libs",
"Status": "install ok installed",
"Suggests": "",
"Version": "254.1-3",
"Version": "254.3-1",
"binary:Package": "libsystemd0:amd64",
"binary:Summary": "systemd utility library",
"db:Status-Abbrev": "ii ",
"db:Status-Want": "install",
"db:Status-Status": "installed",
"db:Status-Eflag": "ok",
"source:Package": "systemd",
"source:Version": "254.1-3"
"source:Version": "254.3-1"
},
{
"Architecture": "amd64",
Expand Down Expand Up @@ -3321,15 +3321,15 @@
"Section": "libs",
"Status": "install ok installed",
"Suggests": "",
"Version": "254.1-3",
"Version": "254.3-1",
"binary:Package": "libudev1:amd64",
"binary:Summary": "libudev shared library",
"db:Status-Abbrev": "ii ",
"db:Status-Want": "install",
"db:Status-Status": "installed",
"db:Status-Eflag": "ok",
"source:Package": "systemd",
"source:Version": "254.1-3"
"source:Version": "254.3-1"
},
{
"Architecture": "amd64",
Expand Down Expand Up @@ -3517,15 +3517,15 @@
"Section": "localization",
"Status": "install ok installed",
"Suggests": "",
"Version": "2.37-9",
"Version": "2.37-10",
"binary:Package": "locales",
"binary:Summary": "GNU C Library: National Language (locale) data [support]",
"db:Status-Abbrev": "ii ",
"db:Status-Want": "install",
"db:Status-Status": "installed",
"db:Status-Eflag": "ok",
"source:Package": "glibc",
"source:Version": "2.37-9"
"source:Version": "2.37-10"
},
{
"Architecture": "amd64",
Expand Down Expand Up @@ -4234,26 +4234,26 @@
"Depends": "libc6 (>= 2.34), libcap2 (>= 1:2.10), libcrypt1 (>= 1:4.4.0), libselinux1 (>= 3.1~)",
"Enhances": "",
"Essential": "no",
"Installed-Size": "296",
"Installed-Size": "300",
"Origin": "",
"Package": "systemd-standalone-sysusers",
"Pre-Depends": "",
"Priority": "optional",
"Provides": "systemd-sysusers (= 254.1-3)",
"Provides": "systemd-sysusers (= 254.3-1)",
"Recommends": "",
"Replace": "",
"Section": "admin",
"Status": "install ok installed",
"Suggests": "",
"Version": "254.1-3",
"Version": "254.3-1",
"binary:Package": "systemd-standalone-sysusers",
"binary:Summary": "standalone sysusers binary for use in non-systemd systems",
"db:Status-Abbrev": "ii ",
"db:Status-Want": "install",
"db:Status-Status": "installed",
"db:Status-Eflag": "ok",
"source:Package": "systemd",
"source:Version": "254.1-3"
"source:Version": "254.3-1"
},
{
"Architecture": "all",
Expand Down
14 changes: 7 additions & 7 deletions debian/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ $ rake mkimage TAG=minimum2scp/debian:latest
installed packages:

```
ii apt 2.7.3 amd64 commandline package manager
ii apt 2.7.5 amd64 commandline package manager
ii base-files 13 amd64 Debian base system miscellaneous files
ii base-passwd 3.6.1 amd64 Debian base system master password and group files
ii bash 5.2.15-2+b4 amd64 GNU Bourne Again SHell
ii bash 5.2.15-2+b5 amd64 GNU Bourne Again SHell
ii bsdutils 1:2.39.2-1 amd64 basic utilities from 4.4BSD-Lite
ii coreutils 9.1-1 amd64 GNU core utilities
ii dash 0.5.12-6 amd64 POSIX-compliant shell
Expand All @@ -39,14 +39,14 @@ ii gzip 1.12-1 amd64 GNU compression utilities
ii hostname 3.23+nmu1 amd64 utility to set/show the host name or domain name
ii init-system-helpers 1.65.2 all helper tools for all init systems
ii libacl1 2.3.1-3 amd64 access control list - shared library
ii libapt-pkg6.0 2.7.3 amd64 package management runtime library
ii libapt-pkg6.0 2.7.5 amd64 package management runtime library
ii libattr1 1:2.5.1-4 amd64 extended attribute handling - shared library
ii libaudit-common 1:3.1.1-1 all Dynamic library for security auditing - common files
ii libaudit1 1:3.1.1-1 amd64 Dynamic library for security auditing
ii libblkid1 2.39.2-1 amd64 block device ID library
ii libbz2-1.0 1.0.8-5+b1 amd64 high-quality block-sorting file compressor library - runtime
ii libc-bin 2.37-9 amd64 GNU C Library: Binaries
ii libc6 2.37-9 amd64 GNU C Library: Shared libraries
ii libc-bin 2.37-10 amd64 GNU C Library: Binaries
ii libc6 2.37-10 amd64 GNU C Library: Shared libraries
ii libcap-ng0 0.8.3-1+b3 amd64 alternate POSIX capabilities library
ii libcap2 1:2.66-4 amd64 POSIX 1003.1e capabilities (library)
ii libcom-err2 1.47.0-2+b1 amd64 common error description library
Expand Down Expand Up @@ -81,10 +81,10 @@ ii libsepol2 3.5-1 amd64 SELinux library for manip
ii libsmartcols1 2.39.2-1 amd64 smart column output alignment library
ii libss2 1.47.0-2+b1 amd64 command-line interface parsing library
ii libstdc++6 13.2.0-4 amd64 GNU Standard C++ Library v3
ii libsystemd0 254.1-3 amd64 systemd utility library
ii libsystemd0 254.3-1 amd64 systemd utility library
ii libtasn1-6 4.19.0-3 amd64 Manage ASN.1 structures (runtime)
ii libtinfo6 6.4+20230625-2 amd64 shared low-level terminfo library for terminal handling
ii libudev1 254.1-3 amd64 libudev shared library
ii libudev1 254.3-1 amd64 libudev shared library
ii libunistring5 1.1-2 amd64 Unicode string library for C
ii libuuid1 2.39.2-1 amd64 Universally Unique ID library
ii libxxhash0 0.8.2-2 amd64 shared library for xxhash
Expand Down
2 changes: 1 addition & 1 deletion debian/Rakefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ desc 'run mkimage.sh'
task :mkimage do
tag_option = ENV['TAG'] ? "-t #{ENV['TAG']}" : ''
debootstrap_options = %w[
--arch=amd64 --variant=minbase --components=main --no-merged-usr
--arch=amd64 --variant=minbase --components=main
]
debootstrap_options << "--cache-dir=#{ENV['DEBOOTSTRAP_CACHE_DIR']}" if ENV['DEBOOTSTRAP_CACHE_DIR']
debootstrap_options << 'sid' << 'http://deb.debian.org/debian'
Expand Down
Loading

0 comments on commit a7674ee

Please sign in to comment.