diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-06-07 11:11:28 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-06-07 11:18:18 +0000 |
| commit | 3edcbbf5dae7856d314f94231c3ad4fe2115ca27 (patch) | |
| tree | d774a474e0a08a9610a38bc2c18653785ddab036 | |
| parent | 8282d74c17bccc1561e480477206e17088a21264 (diff) | |
| download | aports-3edcbbf5dae7856d314f94231c3ad4fe2115ca27.tar.bz2 aports-3edcbbf5dae7856d314f94231c3ad4fe2115ca27.tar.xz | |
main/libc0.9.32: ship ldconfig with uclibc-utils
This is so we don't get circular dependencies:
libc (trigger) depends on busybox which depends on libc
ref #675
| -rw-r--r-- | main/libc0.9.32/APKBUILD | 16 | ||||
| -rw-r--r-- | main/libc0.9.32/uclibc-utils.trigger (renamed from main/libc0.9.32/libc0.9.32.trigger) | 0 |
2 files changed, 10 insertions, 6 deletions
diff --git a/main/libc0.9.32/APKBUILD b/main/libc0.9.32/APKBUILD index 930093251..501083e3e 100644 --- a/main/libc0.9.32/APKBUILD +++ b/main/libc0.9.32/APKBUILD @@ -4,7 +4,7 @@ pkgname=libc$_abiver _gitver= pkgver=0.9.32_rc3 _ver=${pkgver/_/-} -pkgrel=13 +pkgrel=14 pkgdesc="C library for developing embedded Linux systems" url=http://uclibc.org license="LGPL-2" @@ -13,9 +13,9 @@ options= makedepends="linux-headers" subpackages="uclibc-dev:dev uclibc-utils:utils libthread_db" depends_dev="linux-headers=>2.6.32" -replaces="uclibc uclibc-utils" +replaces=uclibc options="!strip" -triggers="$pkgname.trigger:/lib /usr/lib" +triggers= _snapurl="http://git.uclibc.org/uClibc/snapshot/master.tar.bz2" _snapfile="$pkgname-$pkgver.tar.bz2" @@ -40,6 +40,7 @@ source="http://uclibc.org/downloads/uClibc-${_ver}.tar.bz2 uclibcconfig.arm uclibcconfig.powerpc sha512-crypt.patch + uclibc-utils.trigger " _config="$srcdir"/uclibcconfig.${CARCH} @@ -114,8 +115,10 @@ dev() { utils() { pkgdesc="uClibc utility programs" - replaces="uclibc" - mkdir -p "$subpkgdir"/usr/bin + replaces="uclibc $pkgname" + triggers="uclibc-utils.trigger:/lib /usr/lib" + mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/sbin + mv "$pkgdir"/sbin/* "$subpkgdir"/sbin/ mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin/ } @@ -145,4 +148,5 @@ a0b00fb82825f91671b76b1d8f979944 uclibcconfig.x86_64 35ef159d3c56ad67f520ab033e0f6930 uclibcconfig.i486 9c4708d6d5868c2a24f46959eb0be1c7 uclibcconfig.arm f37b8efb311aadf2084dbd25f8b09b07 uclibcconfig.powerpc -7bf1af84106de9e05160ed6d4853c54f sha512-crypt.patch" +7bf1af84106de9e05160ed6d4853c54f sha512-crypt.patch +f3be4f2bc54d7561d252937e10abf0d2 uclibc-utils.trigger" diff --git a/main/libc0.9.32/libc0.9.32.trigger b/main/libc0.9.32/uclibc-utils.trigger index 072c3c738..072c3c738 100644 --- a/main/libc0.9.32/libc0.9.32.trigger +++ b/main/libc0.9.32/uclibc-utils.trigger |