diff options
| author | B. Watson <urchlay@slackware.uk> | 2023-08-03 15:10:28 -0400 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2023-08-12 08:29:51 +0700 |
| commit | d8ff7b6409f391ff426e5a11d9650307d1c0dc10 (patch) | |
| tree | 611f37c231d30a7fbe8d8265884b454ef66f05e1 | |
| parent | 34201e5852fe7c3775521dcc008541e0dcd75779 (diff) | |
system/partclone: Fix conflict with dpkg.
Signed-off-by: B. Watson <urchlay@slackware.uk>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | system/partclone/partclone.SlackBuild | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/system/partclone/partclone.SlackBuild b/system/partclone/partclone.SlackBuild index e915716c380d..1c669f6ba975 100644 --- a/system/partclone/partclone.SlackBuild +++ b/system/partclone/partclone.SlackBuild @@ -22,6 +22,8 @@ # was previously maintained by Kevin Paulus +# 20230803 bkw: Modified by SlackBuilds.org: fix conflict with dpkg. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=partclone @@ -56,6 +58,7 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" + FAILMBR="prebuilt" # 20230803 bkw: see below. else SLKCFLAGS="-O2" LIBDIRSUFFIX="" @@ -72,9 +75,20 @@ cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} + -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} + + +# 20230803 bkw: force use of precompiled fail-mbr.bin, if needed. +# Without this, the build will fail on x86_64 if dpkg happens to be +# installed, because our gcc isn't biarch as Debian's is. If dpkg +# *isn't* installed (the normal case), it just uses the prebuilt +# binary. All this change does is make it always use the prebuilt +# fail-mbr.bin on x86_64. +if [ "$FAILMBR" = "prebuilt" ]; then + sed -i 's,sh compile-mbr.sh,cp fail-mbr.bin.orig fail-mbr.bin,' \ + fail-mbr/Makefile.am +fi ./autogen |