diff options
| author | tnut <tnut at nutyx dot com> | 2012-07-10 22:36:47 +0200 |
|---|---|---|
| committer | piernov <piernov@piernov.org> | 2012-08-06 14:23:21 +0200 |
| commit | 7163d525fe97190d13dab94ccb4646109b90e5e5 (patch) | |
| tree | 6e85da0596e00d59f1ac6a610126930d8f321b2e | |
| parent | 1fbd2f90c6024b1549b2b4ecd19573c0e6195f6d (diff) | |
| download | nutyx-pakxe-7163d525fe97190d13dab94ccb4646109b90e5e5.tar.gz nutyx-pakxe-7163d525fe97190d13dab94ccb4646109b90e5e5.tar.bz2 nutyx-pakxe-7163d525fe97190d13dab94ccb4646109b90e5e5.tar.xz nutyx-pakxe-7163d525fe97190d13dab94ccb4646109b90e5e5.zip | |
pkgutils maj 5.35.2-1, suppression de la partie pkgmk
(cherry picked from commit e0ffeb61735b929704f5c659f2d6052a234da994)
| -rw-r--r-- | pkgutils/.footprint.i686 | 5 | ||||
| -rw-r--r-- | pkgutils/.footprint.x86_64 | 5 | ||||
| -rw-r--r-- | pkgutils/.md5sum.i686 | 3 | ||||
| -rw-r--r-- | pkgutils/.md5sum.x86_64 | 3 | ||||
| -rw-r--r-- | pkgutils/Pkgfile | 25 | ||||
| -rw-r--r-- | pkgutils/pre-install | 4 |
6 files changed, 14 insertions, 31 deletions
diff --git a/pkgutils/.footprint.i686 b/pkgutils/.footprint.i686 index 675aac225..9191b0927 100644 --- a/pkgutils/.footprint.i686 +++ b/pkgutils/.footprint.i686 @@ -1,21 +1,16 @@ drwxr-xr-x root/root etc/ -rw-r--r-- root/root etc/pkgadd.conf --rw-r--r-- root/root etc/pkgmk.conf -rw-r--r-- root/root etc/rejmerge.conf drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/pkgadd lrwxrwxrwx root/root usr/bin/pkginfo -> pkgadd --rwxr-xr-x root/root usr/bin/pkgmk lrwxrwxrwx root/root usr/bin/pkgrm -> pkgadd -rwxr-xr-x root/root usr/bin/rejmerge drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/man/ -drwxr-xr-x root/root usr/share/man/man5/ --rw-r--r-- root/root usr/share/man/man5/pkgmk.conf.5.gz drwxr-xr-x root/root usr/share/man/man8/ -rw-r--r-- root/root usr/share/man/man8/pkgadd.8.gz -rw-r--r-- root/root usr/share/man/man8/pkginfo.8.gz --rw-r--r-- root/root usr/share/man/man8/pkgmk.8.gz -rw-r--r-- root/root usr/share/man/man8/pkgrm.8.gz -rw-r--r-- root/root usr/share/man/man8/rejmerge.8.gz diff --git a/pkgutils/.footprint.x86_64 b/pkgutils/.footprint.x86_64 index 675aac225..9191b0927 100644 --- a/pkgutils/.footprint.x86_64 +++ b/pkgutils/.footprint.x86_64 @@ -1,21 +1,16 @@ drwxr-xr-x root/root etc/ -rw-r--r-- root/root etc/pkgadd.conf --rw-r--r-- root/root etc/pkgmk.conf -rw-r--r-- root/root etc/rejmerge.conf drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/pkgadd lrwxrwxrwx root/root usr/bin/pkginfo -> pkgadd --rwxr-xr-x root/root usr/bin/pkgmk lrwxrwxrwx root/root usr/bin/pkgrm -> pkgadd -rwxr-xr-x root/root usr/bin/rejmerge drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/man/ -drwxr-xr-x root/root usr/share/man/man5/ --rw-r--r-- root/root usr/share/man/man5/pkgmk.conf.5.gz drwxr-xr-x root/root usr/share/man/man8/ -rw-r--r-- root/root usr/share/man/man8/pkgadd.8.gz -rw-r--r-- root/root usr/share/man/man8/pkginfo.8.gz --rw-r--r-- root/root usr/share/man/man8/pkgmk.8.gz -rw-r--r-- root/root usr/share/man/man8/pkgrm.8.gz -rw-r--r-- root/root usr/share/man/man8/rejmerge.8.gz diff --git a/pkgutils/.md5sum.i686 b/pkgutils/.md5sum.i686 index 1f0642bf0..27f861ac5 100644 --- a/pkgutils/.md5sum.i686 +++ b/pkgutils/.md5sum.i686 @@ -1,2 +1 @@ -1ba4346fe9e837b4480183be00e9d8c7 nutyx-attapu.4.patch -6cdd43fce5e8da4d4256e24e24c6556f pkgutils-5.35.1.tar.gz +9a81b50397835bed82d3821c54ba7580 pkgutils-5.35.2.tar.gz diff --git a/pkgutils/.md5sum.x86_64 b/pkgutils/.md5sum.x86_64 index 1f0642bf0..27f861ac5 100644 --- a/pkgutils/.md5sum.x86_64 +++ b/pkgutils/.md5sum.x86_64 @@ -1,2 +1 @@ -1ba4346fe9e837b4480183be00e9d8c7 nutyx-attapu.4.patch -6cdd43fce5e8da4d4256e24e24c6556f pkgutils-5.35.1.tar.gz +9a81b50397835bed82d3821c54ba7580 pkgutils-5.35.2.tar.gz diff --git a/pkgutils/Pkgfile b/pkgutils/Pkgfile index 1a8b0ebbc..73743ec25 100644 --- a/pkgutils/Pkgfile +++ b/pkgutils/Pkgfile @@ -4,26 +4,17 @@ # Packager: thierryn1 at hispeed dot ch name=pkgutils -version=5.35.1 -release=2 -source=(http://crux.nu/files/$name-$version.tar.gz \ -http://nutyx.meticul.eu/files/patchs/$name/nutyx-attapu.4.patch) +version=5.35.2 +release=1 +source=(http://crux.nu/files/$name-$version.tar.gz) build () { cd $name-$version mkdir -p $PKG/usr/share -patch -Np1 -i ../nutyx-attapu.4.patch make DESTDIR=$PKG install -case `uname -m` in - x86_64) - sed -i "s/march=native/mtune=generic/" $PKG/etc/pkgmk.conf - sed -i "s/\".md5sum\"/\".md5sum.x86_64\"/" $PKG/usr/bin/pkgmk - sed -i "s/\".footprint\"/\".footprint.x86_64\"/" $PKG/usr/bin/pkgmk;; - i?86) - sed -i "s/native/i686/" $PKG/etc/pkgmk.conf - sed -i "s/\".md5sum\"/\".md5sum.i686\"/" $PKG/usr/bin/pkgmk - sed -i "s/\".footprint\"/\".footprint.i686\"/" $PKG/usr/bin/pkgmk;; -esac - mv $PKG/usr/man \ - $PKG/usr/share/man +rm $PKG/usr/bin/pkgmk +rm $PKG/etc/pkgmk.conf +rm -r $PKG/usr/man/man5 +rm $PKG/usr/man/man8/pkgmk.8 +mv $PKG/usr/man $PKG/usr/share/man } diff --git a/pkgutils/pre-install b/pkgutils/pre-install new file mode 100644 index 000000000..dc2513842 --- /dev/null +++ b/pkgutils/pre-install @@ -0,0 +1,4 @@ +if [ -f /etc/pkgmk.conf ];then + cp /etc/pkgmk.conf{,.original} + echo "/etc/pkgmk.conf sauvegardé en /etc/pkgmk.conf.original" +fi |