commit f282cc2d23e44dca63ff133b7db9762eecc21164 Author: Juergen Daubert <jue@jue.li> Date: Mon Jul 27 19:50:38 2015 +0200 glibc-32: cleanup diff --git a/glibc-32/.footprint b/glibc-32/.footprint index 34648be..9ba09a1 100644 --- a/glibc-32/.footprint +++ b/glibc-32/.footprint @@ -53,8 +53,6 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/gnu/ -rwxr-xr-x root/root usr/include/gnu/stubs-32.h -drwxr-xr-x root/root usr/lib/ -drwxr-xr-x root/root usr/lib/locale/ drwxr-xr-x root/root usr/lib32/ -rw-r--r-- root/root usr/lib32/Mcrt1.o -rw-r--r-- root/root usr/lib32/Scrt1.o diff --git a/glibc-32/.md5sum b/glibc-32/.md5sum index ade276e..314f01b 100644 --- a/glibc-32/.md5sum +++ b/glibc-32/.md5sum @@ -1,8 +1,3 @@ 9cb398828e8f84f57d1f7d5588cf40cd glibc-2.21.tar.xz -96156bec8e05de67384dc93e72bdc313 host.conf -fbbc215a9b15ba4846f326cc88108057 hosts 87bb2a93d7887505a39fd65a2ee86b8e kernel-headers-4.1.tar.xz -f7fefce570a3c776e26e778c5e401490 ld.so.conf a8f4549c716cd37244fbf1ed059497f8 lib32.conf -75931315bf9bc9be15a5e25e4ddd5f0d nsswitch.conf -acf9daad1ee85de5efd3543965596a63 resolv.conf diff --git a/glibc-32/Pkgfile b/glibc-32/Pkgfile index 96a7909..bf0687c 100644 --- a/glibc-32/Pkgfile +++ b/glibc-32/Pkgfile @@ -4,18 +4,12 @@ name=glibc-32 version=2.21 -release=1 +release=2 source=(http://ftp.gnu.org/gnu/glibc/glibc-$version.tar.xz \ http://crux.nu/files/distfiles/kernel-headers-4.1.tar.xz \ - hosts resolv.conf nsswitch.conf host.conf ld.so.conf \ lib32.conf) build() { - # install kernel headers - mkdir $PKG/usr/ - cp -r kernel-headers-4.1/include $PKG/usr - chown root:root $PKG/usr - mkdir build cd build @@ -25,7 +19,7 @@ build() { ../glibc-$version/configure --prefix=/usr \ --libdir=/usr/lib32 \ --libexecdir=/usr/lib32 \ - --with-headers=$PKG/usr/include \ + --with-headers=$SRC/kernel-headers-4.1/include \ --enable-kernel=3.12 \ --enable-add-ons \ --disable-profile \ @@ -38,16 +32,14 @@ build() { #make check make install_root=$PKG install - cp $SRC/{hosts,resolv.conf,nsswitch.conf,host.conf,ld.so.conf} $PKG/etc - ln -sf ../usr/share/zoneinfo/UTC $PKG/etc/localtime - mkdir -p $PKG/etc/ld.so.conf.d $PKG/usr/lib/locale - touch $PKG/etc/ld.so.cache + rm -r $PKG/usr/{bin,sbin,share} $PKG/{etc,sbin} $PKG/var - rm -rf $PKG/usr/{bin,sbin,share} $PKG/{etc,sbin} $PKG/var - (mv $PKG/usr/include/gnu/stubs-32.h $SRC; - rm -rf $PKG/usr/include; - install -D $SRC/stubs-32.h $PKG/usr/include/gnu/stubs-32.h) + mv $PKG/usr/include/gnu/stubs-32.h $SRC + rm -r $PKG/usr/include + install -D $SRC/stubs-32.h $PKG/usr/include/gnu/stubs-32.h install -D $SRC/lib32.conf $PKG/etc/ld.so.conf.d/lib32.conf - mkdir $PKG/lib && ln -s /lib32/ld-linux.so.2 $PKG/lib/ld-linux.so.2 + + install -d $PKG/lib + ln -s /lib32/ld-linux.so.2 $PKG/lib/ld-linux.so.2 } diff --git a/glibc-32/host.conf b/glibc-32/host.conf deleted file mode 100644 index 4500cf9..0000000 --- a/glibc-32/host.conf +++ /dev/null @@ -1,8 +0,0 @@ -# -# /etc/host.conf: resolver configuration file -# - -order hosts,bind -multi on - -# End of file diff --git a/glibc-32/hosts b/glibc-32/hosts deleted file mode 100644 index ba5afd1..0000000 --- a/glibc-32/hosts +++ /dev/null @@ -1,17 +0,0 @@ -# -# /etc/hosts: static lookup table for host names -# - -# IPv4 -127.0.0.1 localhost -#<ip-address> <hostname.domain.org> <aliases> - -# IPv6 -#::1 ip6-localhost ip6-loopback -#fe00::0 ip6-localnet -#ff00::0 ip6-mcastprefix -#ff02::1 ip6-allnodes -#ff02::2 ip6-allrouters -#ff02::3 ip6-allhosts - -# End of file diff --git a/glibc-32/ld.so.conf b/glibc-32/ld.so.conf deleted file mode 100644 index 524e100..0000000 --- a/glibc-32/ld.so.conf +++ /dev/null @@ -1,7 +0,0 @@ -# -# /etc/ld.so.conf: dynamic linker configuration file -# - -include /etc/ld.so.conf.d/*.conf - -# End of file diff --git a/glibc-32/nsswitch.conf b/glibc-32/nsswitch.conf deleted file mode 100644 index ef1f6b3..0000000 --- a/glibc-32/nsswitch.conf +++ /dev/null @@ -1,24 +0,0 @@ -# -# /etc/nsswitch.conf: name service switch configuration file -# - -passwd: files -group: files -shadow: files - -hosts: files dns -networks: files - -services: files -protocols: files -rpc: files -publickey: files -ethers: files -netmasks: files -netgroup: files -bootparams: files - -automount: files -aliases: files - -# End of file diff --git a/glibc-32/post-install b/glibc-32/post-install deleted file mode 100644 index fae8589..0000000 --- a/glibc-32/post-install +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -/sbin/telinit U - diff --git a/glibc-32/resolv.conf b/glibc-32/resolv.conf deleted file mode 100644 index 84e724c..0000000 --- a/glibc-32/resolv.conf +++ /dev/null @@ -1,8 +0,0 @@ -# -# /etc/resolv.conf: resolver configuration file -# - -#search <domain.org> -#nameserver <ip-address> - -# End of file