diff options
Diffstat (limited to 'debian/patches/0001-hooks-maybe-merged-usr-prepare-for-the-time-when-usr.patch')
| -rw-r--r-- | debian/patches/0001-hooks-maybe-merged-usr-prepare-for-the-time-when-usr.patch | 94 |
1 files changed, 94 insertions, 0 deletions
diff --git a/debian/patches/0001-hooks-maybe-merged-usr-prepare-for-the-time-when-usr.patch b/debian/patches/0001-hooks-maybe-merged-usr-prepare-for-the-time-when-usr.patch new file mode 100644 index 0000000..ec32f84 --- /dev/null +++ b/debian/patches/0001-hooks-maybe-merged-usr-prepare-for-the-time-when-usr.patch @@ -0,0 +1,94 @@ +From d883fa13bbb9ac78cc3e16511fc7359314ae256d Mon Sep 17 00:00:00 2001 +From: Johannes Schauer Marin Rodrigues <josch@mister-muffin.de> +Date: Mon, 26 Feb 2024 14:52:43 +0100 +Subject: [PATCH] hooks/maybe-merged-usr: prepare for the time when + usr-is-merged exists only as a virtual package + +--- + hooks/maybe-merged-usr/essential00.sh | 4 ++++ + hooks/maybe-merged-usr/extract00.sh | 20 +++++++++++++++----- + hooks/maybe-merged-usr/setup00.sh | 20 +++++++++++++++----- + 3 files changed, 34 insertions(+), 10 deletions(-) + +diff --git a/hooks/maybe-merged-usr/essential00.sh b/hooks/maybe-merged-usr/essential00.sh +index a23f2f7..656057e 100755 +--- a/hooks/maybe-merged-usr/essential00.sh ++++ b/hooks/maybe-merged-usr/essential00.sh +@@ -15,6 +15,10 @@ case "$ver" in + echo "usr-is-merged package from src:usrmerge installed -- not running merged-usr essential hook" >&2 + exit 0 + ;; ++ 'not-installed ') ++ echo "usr-is-merged was not installed in a previous hook -- not running merged-usr essential hook" >&2 ++ exit 0 ++ ;; + *) + echo "unexpected situation for package usr-is-merged: $ver" >&2 + exit 1 +diff --git a/hooks/maybe-merged-usr/extract00.sh b/hooks/maybe-merged-usr/extract00.sh +index dc88450..00bb037 100755 +--- a/hooks/maybe-merged-usr/extract00.sh ++++ b/hooks/maybe-merged-usr/extract00.sh +@@ -4,12 +4,22 @@ set -eu + + env --chdir="$1" APT_CONFIG="$MMDEBSTRAP_APT_CONFIG" apt-get update --error-on=any + +-# if the usr-is-merged package cannot be installed with apt, do nothing +-if ! env --chdir="$1" APT_CONFIG="$MMDEBSTRAP_APT_CONFIG" apt-cache show --no-all-versions usr-is-merged > /dev/null 2>&1; then +- echo "no package called usr-is-merged found -- not running merged-usr extract hook" >&2 +- exit 0 ++if env --chdir="$1" APT_CONFIG="$MMDEBSTRAP_APT_CONFIG" apt-cache show --no-all-versions usr-is-merged > /dev/null 2>&1; then ++ # if apt-cache exited successfully, then usr-is-merged exists either as ++ # a real or virtual package ++ if env --chdir="$1" APT_CONFIG="$MMDEBSTRAP_APT_CONFIG" apt-cache show --no-all-versions usr-is-merged 2>/dev/null | grep -q "Package: usr-is-merged"; then ++ echo "usr-is-merged found -- running merged-usr extract hook" >&2 ++ else ++ # The usr-is-merged must be virtual, so assume that nothing ++ # has to be done. This is the case with Debian Trixie or later ++ # or with Ubuntu Lunar or later ++ echo "usr-is-merged found but not real -- not running merged-usr extract hook" >&2 ++ exit 0 ++ fi + else +- echo "package usr-is-merged found -- running merged-usr extract hook" >&2 ++ # if the usr-is-merged package cannot be installed with apt, do nothing ++ echo "no package providing usr-is-merged found -- not running merged-usr extract hook" >&2 ++ exit 0 + fi + + # resolve the script path using several methods in order: +diff --git a/hooks/maybe-merged-usr/setup00.sh b/hooks/maybe-merged-usr/setup00.sh +index a6bd712..6568af2 100755 +--- a/hooks/maybe-merged-usr/setup00.sh ++++ b/hooks/maybe-merged-usr/setup00.sh +@@ -4,12 +4,22 @@ set -eu + + env --chdir="$1" APT_CONFIG="$MMDEBSTRAP_APT_CONFIG" apt-get update --error-on=any + +-# if the usr-is-merged package cannot be installed with apt, do nothing +-if ! env --chdir="$1" APT_CONFIG="$MMDEBSTRAP_APT_CONFIG" apt-cache show --no-all-versions usr-is-merged > /dev/null 2>&1; then +- echo "no package called usr-is-merged found -- not running merged-usr setup hook" >&2 +- exit 0 ++if env --chdir="$1" APT_CONFIG="$MMDEBSTRAP_APT_CONFIG" apt-cache show --no-all-versions usr-is-merged > /dev/null 2>&1; then ++ # if apt-cache exited successfully, then usr-is-merged exists either as ++ # a real or virtual package ++ if env --chdir="$1" APT_CONFIG="$MMDEBSTRAP_APT_CONFIG" apt-cache show --no-all-versions usr-is-merged 2>/dev/null | grep -q "Package: usr-is-merged"; then ++ echo "usr-is-merged found -- running merged-usr setup hook" >&2 ++ else ++ # The usr-is-merged must be virtual, so assume that nothing ++ # has to be done. This is the case with Debian Trixie or later ++ # or with Ubuntu Lunar or later ++ echo "usr-is-merged found but not real -- not running merged-usr setup hook" >&2 ++ exit 0 ++ fi + else +- echo "package usr-is-merged found -- running merged-usr setup hook" >&2 ++ # if the usr-is-merged package cannot be installed with apt, do nothing ++ echo "no package providing usr-is-merged found -- not running merged-usr setup hook" >&2 ++ exit 0 + fi + + # resolve the script path using several methods in order: +-- +2.39.2 + |