Skip to content

Update deb_postfix.bzl to not merge sbin and bin #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thesayyn merged 1 commit into from
Nov 6, 2025
+2 −3
Merged

Update deb_postfix.bzl to not merge sbin and bin #200

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions apt/private/deb_postfix.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ def deb_postfix(name, srcs, outs, mergedusr = False, **kwargs):

# If mergedusr, then rewrite paths to hoist bins/libs from / of the fs to /usr counterpart.
# Be careful with this option as it assumes that /usr/ is mounted as one filesystem.
# This implementation does not merge /usr/sbin and /usr/bin as prescribed by debian
# Read more:
# https://wiki.gentoo.org/wiki/Merge-usr
# https://salsa.debian.org/md/usrmerge/raw/master/debian/README.Debian
Expand All @@ -36,8 +37,7 @@ def deb_postfix(name, srcs, outs, mergedusr = False, **kwargs):
apply = """\
$(BSDTAR_BIN) --confirmation --gzip -cf "$$layer" \
-s "#^\\./bin/\\(.\\)#./usr/bin/\\1#" \
-s "#^\\./sbin/\\(.\\)#./usr/bin/\\1#" \
-s "#^\\./usr/sbin/\\(.\\)#./usr/bin/\\1#" \
-s "#^\\./sbin/\\(.\\)#./usr/sbin/\\1#" \
-s "#^\\./lib/\\(.\\)#./usr/lib/\\1#" \
-s "#^\\./lib32/\\(.\\)#./usr/lib32/\\1#" \
-s "#^\\./lib64/\\(.\\)#./usr/lib64/\\1#" \
Expand All @@ -49,7 +49,6 @@ def deb_postfix(name, srcs, outs, mergedusr = False, **kwargs):
if (substr($$1, 1, 1) == "d" && (\\
$$9 == "./bin/" ||\\
$$9 == "./sbin/" ||\\
$$9 == "./usr/sbin/" ||\\
$$9 == "./lib/" ||\\
$$9 == "./lib32/" ||\\
$$9 == "./lib64/" ||\\
Expand Down