diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/alpine-baselayout/APKBUILD | 3 | ||||
| -rw-r--r-- | core/libtool/APKBUILD | 12 | ||||
| -rw-r--r-- | core/mkinitfs/APKBUILD | 11 | ||||
| -rw-r--r-- | core/mkinitfs/blacklist.patch | 15 |
4 files changed, 11 insertions, 30 deletions
diff --git a/core/alpine-baselayout/APKBUILD b/core/alpine-baselayout/APKBUILD index d02b76c7a..85ab41322 100644 --- a/core/alpine-baselayout/APKBUILD +++ b/core/alpine-baselayout/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-baselayout pkgver=2.0_alpha11 -pkgrel=0 +pkgrel=1 pkgdesc="Alpine base dir structure and init scripts" url=http://git.alpinelinux.org/cgit/alpine-baselayout depends="uclibc" @@ -12,5 +12,6 @@ build() { cd "$srcdir"/$pkgname-$pkgver make make install PREFIX= DESTDIR="$pkgdir" || return 1 + chmod 700 "$pkgdir"/root } md5sums="5b9d5506690e7cf41e92be5202c40630 alpine-baselayout-2.0_alpha11.tar.bz2" diff --git a/core/libtool/APKBUILD b/core/libtool/APKBUILD index 185e2df9f..3d2ab55f0 100644 --- a/core/libtool/APKBUILD +++ b/core/libtool/APKBUILD @@ -2,21 +2,19 @@ pkgname=libtool pkgver=2.2.6a _myver=2.2.6 -pkgrel=2 +pkgrel=4 pkgdesc="A generic library support script" license='GPL' url="http://www.gnu.org/software/libtool" source="ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.gz" -depends="uclibc libltdl" -subpackages="libltdl" +depends="uclibc libltdl bash" +subpackages="libltdl $pkgname-doc" build() { - cd $srcdir/$pkgname-$_myver + cd "$srcdir"/$pkgname-$_myver ./configure --prefix=/usr make || return 1 - make DESTDIR=${startdir}/pkg install - - rm -f ${pkgdir}/usr/share/info/dir + make DESTDIR="$pkgdir" install } libltdl() { diff --git a/core/mkinitfs/APKBUILD b/core/mkinitfs/APKBUILD index 86bf8333d..fc3625d9d 100644 --- a/core/mkinitfs/APKBUILD +++ b/core/mkinitfs/APKBUILD @@ -1,19 +1,16 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mkinitfs -pkgver=1.4 -pkgrel=1 +pkgver=1.4.3 +pkgrel=0 pkgdesc="Tool to generate initramfs images for Alpine" url=http://git.alpinelinux.org/cgit/mkinitfs depends="busybox" -source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 - blacklist.patch" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" license="GPL-2" build() { cd "$srcdir"/$pkgname-$pkgver - patch -p1 < ../blacklist.patch || return 1 make make install DESTDIR="$pkgdir" || return 1 } -md5sums="a50e5ca22364be12f1cf0f089b4ab52e mkinitfs-1.4.tar.bz2 -88de14691e09e7b6b156f1cc7d5d93a6 blacklist.patch" +md5sums="953a9db8d9d4c63bb5f57c3478069330 mkinitfs-1.4.3.tar.bz2" diff --git a/core/mkinitfs/blacklist.patch b/core/mkinitfs/blacklist.patch deleted file mode 100644 index 6d11954f9..000000000 --- a/core/mkinitfs/blacklist.patch +++ /dev/null @@ -1,15 +0,0 @@ -commit 1c050920d584c2a26b9088fb8e5234b6818ba682 -Author: Natanael Copa <ncopa@alpinelinux.org> -Date: Fri May 15 13:21:43 2009 +0000 - - add the modprobe blacklist to initramfs image - -diff --git a/files.d/base b/files.d/base -index 3387370..c16fe0b 100644 ---- a/files.d/base -+++ b/files.d/base -@@ -10,3 +10,4 @@ - /lib/ld-uClibc.so* - /lib/mdev - /sbin/apk -+/etc/modprobe.d/blacklist |