Skip to content

Commit d2a9174

Browse files
authored
Update deb_postfix.bzl to not merge sbin and bin (#200)
Debian usrmerge does not merge /usr/sbin and /usr/bin https://salsa.debian.org/md/usrmerge/raw/master/debian/README.Debian
1 parent 6e65679 commit d2a9174

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

apt/private/deb_postfix.bzl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ def deb_postfix(name, srcs, outs, mergedusr = False, **kwargs):
2525

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

0 commit comments

Comments
 (0)