From 0bddd9a712605de8e8b197cadc82a82a2d62681f Mon Sep 17 00:00:00 2001 From: nemetho Date: Sun, 31 Dec 2017 13:08:27 +0100 Subject: [PATCH] fix: pacman 3.5.4() addon script - (copy addin etc files keeping permissions) - template build (compile) file creator --- old_lfs_toolchain/pacman/PKGBUILD_pkg1 | 2 +- old_lfs_toolchain/pacman/PKGBUILD_pkg2 | 2 +- old_lfs_toolchain/pacman/_mkpkgbuild | 5 ++++- old_lfs_toolchain/pacman/addon/PKGBUILD | 2 +- old_lfs_toolchain/pacman/addon/PKGBUILD64 | 2 +- old_lfs_toolchain/pacman/pacman.txt | 3 ++- scripts/_mkpkgbuild | 5 ++++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/old_lfs_toolchain/pacman/PKGBUILD_pkg1 b/old_lfs_toolchain/pacman/PKGBUILD_pkg1 index 7809cde..4efb634 100644 --- a/old_lfs_toolchain/pacman/PKGBUILD_pkg1 +++ b/old_lfs_toolchain/pacman/PKGBUILD_pkg1 @@ -41,6 +41,6 @@ if [ -d $pkgdir/usr/info ]; then mv $pkgdir/usr/info $pkgdir/usr/share fi rm -f $pkgdir/usr/share/info/dir -[ -d $startdir/etc ] && cp -RP $startdir/etc $pkgdir +[ -d $startdir/etc ] && cp -Rdp $startdir/etc $pkgdir return 0 } diff --git a/old_lfs_toolchain/pacman/PKGBUILD_pkg2 b/old_lfs_toolchain/pacman/PKGBUILD_pkg2 index fc1b6be..cb3d850 100644 --- a/old_lfs_toolchain/pacman/PKGBUILD_pkg2 +++ b/old_lfs_toolchain/pacman/PKGBUILD_pkg2 @@ -43,6 +43,6 @@ if [ -d $pkgdir/usr/info ]; then mv $pkgdir/usr/info $pkgdir/usr/share fi rm -f $pkgdir/usr/share/info/dir -[ -d $startdir/etc ] && cp -RP $startdir/etc $pkgdir +[ -d $startdir/etc ] && cp -Rdp $startdir/etc $pkgdir return 0 } diff --git a/old_lfs_toolchain/pacman/_mkpkgbuild b/old_lfs_toolchain/pacman/_mkpkgbuild index 05f97f8..a693f82 100755 --- a/old_lfs_toolchain/pacman/_mkpkgbuild +++ b/old_lfs_toolchain/pacman/_mkpkgbuild @@ -1,5 +1,8 @@ #!/bin/sh +#pacman 3.5.4(and other) addon script +#template build (compile) file creator + [ -f PKGBUILD ] && exit 1 ARCHIVE=`find -maxdepth 1 -type f \( -name "*.tar.*" -o -name "*.tgz" \) -printf "%f\n" | sort | tail -n 1` @@ -59,7 +62,7 @@ if [ -d \$pkgdir/usr/info ]; then mv \$pkgdir/usr/info \$pkgdir/usr/share fi rm -f \$pkgdir/usr/share/info/dir -[ -d \$startdir/etc ] && cp -RP \$startdir/etc \$pkgdir +[ -d \$startdir/etc ] && cp -Rdp \$startdir/etc \$pkgdir return 0 } EOF diff --git a/old_lfs_toolchain/pacman/addon/PKGBUILD b/old_lfs_toolchain/pacman/addon/PKGBUILD index 781337a..dc82fac 100644 --- a/old_lfs_toolchain/pacman/addon/PKGBUILD +++ b/old_lfs_toolchain/pacman/addon/PKGBUILD @@ -36,6 +36,6 @@ if [ -d $pkgdir/usr/man ]; then mv $pkgdir/usr/man $pkgdir/usr/share fi rm -f $pkgdir/usr/share/info/dir -[ -d $startdir/etc ] && cp -RP $startdir/etc $pkgdir +[ -d $startdir/etc ] && cp -Rdp $startdir/etc $pkgdir return 0 } diff --git a/old_lfs_toolchain/pacman/addon/PKGBUILD64 b/old_lfs_toolchain/pacman/addon/PKGBUILD64 index 5d55ffd..bd81f63 100644 --- a/old_lfs_toolchain/pacman/addon/PKGBUILD64 +++ b/old_lfs_toolchain/pacman/addon/PKGBUILD64 @@ -36,6 +36,6 @@ if [ -d $pkgdir/usr/man ]; then mv $pkgdir/usr/man $pkgdir/usr/share fi rm -f $pkgdir/usr/share/info/dir -[ -d $startdir/etc ] && cp -RP $startdir/etc $pkgdir +[ -d $startdir/etc ] && cp -Rdp $startdir/etc $pkgdir return 0 } diff --git a/old_lfs_toolchain/pacman/pacman.txt b/old_lfs_toolchain/pacman/pacman.txt index 86b9e1f..845e2e6 100644 --- a/old_lfs_toolchain/pacman/pacman.txt +++ b/old_lfs_toolchain/pacman/pacman.txt @@ -1,7 +1,7 @@ #commands #build makepkg -#install/upgrade/remove +#install/upgrade/remove/query pacman -Sy pacman -Su pacman -S pkg @@ -9,3 +9,4 @@ pacman -R pkg pacman -U pkg pacman -Sl pacman -Ql +pacman -Qo file diff --git a/scripts/_mkpkgbuild b/scripts/_mkpkgbuild index 05f97f8..a693f82 100755 --- a/scripts/_mkpkgbuild +++ b/scripts/_mkpkgbuild @@ -1,5 +1,8 @@ #!/bin/sh +#pacman 3.5.4(and other) addon script +#template build (compile) file creator + [ -f PKGBUILD ] && exit 1 ARCHIVE=`find -maxdepth 1 -type f \( -name "*.tar.*" -o -name "*.tgz" \) -printf "%f\n" | sort | tail -n 1` @@ -59,7 +62,7 @@ if [ -d \$pkgdir/usr/info ]; then mv \$pkgdir/usr/info \$pkgdir/usr/share fi rm -f \$pkgdir/usr/share/info/dir -[ -d \$startdir/etc ] && cp -RP \$startdir/etc \$pkgdir +[ -d \$startdir/etc ] && cp -Rdp \$startdir/etc \$pkgdir return 0 } EOF -- 2.11.4.GIT