summaryrefslogtreecommitdiff
path: root/create_glibc_shim.sh
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2018-02-08 08:20:46 +0100
committerAndreas Baumann <mail@andreasbaumann.cc>2018-02-08 08:20:46 +0100
commit0488b164de85e2fe8dc0bd67c3a0c3dfe9343a10 (patch)
tree7a22a7bc66f92d76ecf1e202c796bf5287f2e9b4 /create_glibc_shim.sh
parent1405eedff471bc3cea6ab29dea00bf3c4148bcd2 (diff)
downloadbootstrap32-0488b164de85e2fe8dc0bd67c3a0c3dfe9343a10.tar.xz
reverted naming of shims for gcc-lib, glibc and ca-certificates
Diffstat (limited to 'create_glibc_shim.sh')
-rwxr-xr-xcreate_glibc_shim.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/create_glibc_shim.sh b/create_glibc_shim.sh
index d79d41f..7d16b44 100755
--- a/create_glibc_shim.sh
+++ b/create_glibc_shim.sh
@@ -55,15 +55,13 @@ if test ! -f $STAGE1_CHROOT/packages/$TARGET_CPU/glibc-shim-2.26-1-$TARGET_CPU.p
size=`du -sk --apparent-size pkg/`
size="$(( ${size%%[^0-9]*} * 1024 ))"
cat > pkg/glibc-shim/.PKGINFO <<EOF
-pkgname = glibc-shim
+pkgname = glibc
pkgver = 2.26-1
pkgdesc = GNU C Library (from crosstool-ng sysroot)
url = http://www.gnu.org/software/libc
builddate = $BUILDDATE
size = $size
arch = $TARGET_CPU
-provides = glibc
-conflict = glibc
EOF
cd pkg/glibc-shim
@@ -75,7 +73,7 @@ EOF
rm -rf $STAGE1_CHROOT/packages/$TARGET_CPU/temp.db*
rm -rf $STAGE1_CHROOT/packages/$TARGET_CPU/temp.files*
repo-add $STAGE1_CHROOT/packages/$TARGET_CPU/temp.db.tar.gz $STAGE1_CHROOT/packages/$TARGET_CPU/*pkg.tar.xz
- sudo pacman --force --noconfirm --config $STAGE1_CHROOT/etc/pacman.conf -r $STAGE1_CHROOT -Syy glibc-shim
+ sudo pacman --force --noconfirm --config $STAGE1_CHROOT/etc/pacman.conf -r $STAGE1_CHROOT -Syy glibc
fi