Commit 361b42e9 authored by Daniele's avatar Daniele
Browse files

Modifying some core PKGBUILDs so that they place their binaries in a /usr...

Modifying some core PKGBUILDs so that they place their binaries in a /usr prefix, not in a / prefix.
parent 420301db
......@@ -5,7 +5,7 @@
pkgname=coreutils
pkgver=8.17
pkgrel=1
pkgrel=2
pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system"
arch=('i686' 'x86_64')
license=('GPL3')
......@@ -14,21 +14,22 @@ groups=('base')
depends=('glibc' 'pam' 'acl' 'gmp' 'libcap')
replaces=('mktemp')
backup=('etc/pam.d/su')
install=${pkgname}.install
install="${pkgname}.install"
options=('!emptydirs')
source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}
coreutils-pam.patch
su.pam)
source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"
"ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz.sig"
'coreutils-pam.patch'
'su.pam')
md5sums=('bbda656ce8ca2c6903948f9faa204ba3'
'ebecd29b095aa21b0b2f833f1ec20d70'
'aad79a2aa6d566c375d7bdd1b0767278'
'fa85e5cce5d723275b14365ba71a8aad')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
cd "${srcdir}/${pkgname}-${pkgver}"
# added su wheel group pam patch (from fedora git)
patch -Np1 -i ${srcdir}/coreutils-pam.patch
patch -Np1 -i "${srcdir}/coreutils-pam.patch"
autoreconf -v
./configure --prefix=/usr --libexecdir=/usr/lib/coreutils \
......@@ -39,27 +40,22 @@ build() {
}
check() {
cd ${srcdir}/${pkgname}-${pkgver}
cd "${srcdir}/${pkgname}-${pkgver}"
make RUN_EXPENSIVE_TESTS=yes check
}
package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
cd ${pkgdir}/usr/bin
install -dm755 ${pkgdir}/{bin,usr/sbin}
# binaries required by FHS
_fhs=('cat' 'chgrp' 'chmod' 'chown' 'cp' 'date' 'dd' 'df' 'echo' 'false'
'ln' 'ls' 'mkdir' 'mknod' 'mv' 'pwd' 'rm' 'rmdir' 'stty' 'su' 'sync'
'true' 'uname')
mv ${_fhs[@]} ${pkgdir}/bin
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
# makepkg uses the full path to this...
ln -s /usr/bin/du ${pkgdir}/bin/du
install -d -m755 "${pkgdir}/bin"
ln -s /usr/bin/du "${pkgdir}/bin/du"
mv chroot ${pkgdir}/usr/sbin
install -Dm644 ${srcdir}/su.pam ${pkgdir}/etc/pam.d/su
install -d -m755 "${pkgdir}/usr/sbin"
mv "${pkgdir}/usr/bin/chroot" "${pkgdir}/usr/sbin"
install -D -m644 "${srcdir}/su.pam" "${pkgdir}/etc/pam.d/su"
}
# vim:set ts=2 sw=2 et:
......@@ -6,7 +6,7 @@
pkgname=grep
pkgver=2.9
pkgrel=2
pkgrel=3
pkgdesc="A string search utility"
arch=('i686' 'x86_64')
license=('GPL3')
......@@ -14,13 +14,22 @@ url="http://www.gnu.org/software/grep/grep.html"
groups=('base')
depends=('glibc' 'pcre' 'sh')
makedepends=('texinfo>=4.8a')
install=${pkgname}.install
source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz)
install="${pkgname}.install"
source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz")
md5sums=('25e41b2aa201104354740961ef36005a')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
./configure --prefix=/usr --bindir=/bin --without-included-regex
make || return 1
make DESTDIR=${pkgdir} install || return 1
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr \
--without-included-regex
make
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
}
# vim:set ts=2 sw=2 et:
......@@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=gzip
pkgver=1.4
pkgrel=3
pkgrel=4
pkgdesc="GNU compression utility"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/gzip/"
......@@ -18,7 +18,7 @@ groups=('base')
depends=('glibc' 'bash')
makedepends=('patch')
install=gzip.install
source=(ftp://ftp.gnu.org/pub/gnu/gzip/gzip-$pkgver.tar.gz)
source=("ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
md5sums=('e381b8506210c794278f5527cba0e765')
build() {
......@@ -35,10 +35,10 @@ build() {
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make prefix=${pkgdir}/usr install
make prefix="${pkgdir}/usr" install
install -dm755 ${pkgdir}/bin
mv ${pkgdir}/usr/bin/{gunzip,gzip,uncompress,zcat} ${pkgdir}/bin/
cd $pkgdir/bin
ln -sf ${pkgname} compress
cd "${pkgdir}/usr/bin"
ln -sf "${pkgname}" compress
}
# vim:set ts=2 sw=2 et:
......@@ -4,7 +4,7 @@
pkgname=sed
pkgver=4.2.1
pkgrel=3
pkgrel=4
pkgdesc="GNU stream editor"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/sed"
......@@ -13,16 +13,21 @@ groups=('base')
depends=('acl' 'sh')
makedepends=('gettext')
install=sed.install
source=(ftp://ftp.gnu.org/pub/gnu/sed/$pkgname-$pkgver.tar.gz)
source=("ftp://ftp.gnu.org/pub/gnu/sed/${pkgname}-${pkgver}.tar.gz")
md5sums=('f0fd4d7da574d4707e442285fd2d3b86')
build() {
cd $srcdir/$pkgname-$pkgver
./configure --prefix=/usr --bindir=/bin --without-included-regex
make || return 1
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr \
--without-included-regex
make
}
package() {
cd $srcdir/$pkgname-$pkgver
make DESTDIR=$pkgdir install
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
}
# vim:set ts=2 sw=2 et:
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment