diff options
| author | Tim Biermann <tbier@posteo.de> | 2022-01-07 18:37:13 +0100 |
|---|---|---|
| committer | Tim Biermann <tbier@posteo.de> | 2022-01-07 18:37:13 +0100 |
| commit | 080bf5002954bafa838ba8f5a5b4fc1568c9b631 (patch) | |
| tree | 691443a0e16141242e6d236c551cb95160529266 /glibc | |
| parent | 39270dd147fc6b4f529e9549ac12dffb4aee2e1d (diff) | |
| parent | 30c3943f7ff48a5fe9a6467cbd8164dd096df492 (diff) | |
| download | core-080bf5002954bafa838ba8f5a5b4fc1568c9b631.tar.gz core-080bf5002954bafa838ba8f5a5b4fc1568c9b631.tar.xz | |
Merge branch '3.7-alpha0' into 3.7
Diffstat (limited to 'glibc')
| -rw-r--r-- | glibc/.footprint | 2 | ||||
| -rw-r--r-- | glibc/.signature | 6 | ||||
| -rw-r--r-- | glibc/Pkgfile | 27 | ||||
| -rw-r--r-- | glibc/post-install | 1 |
4 files changed, 20 insertions, 16 deletions
diff --git a/glibc/.footprint b/glibc/.footprint index ae9de8ae..8965647b 100644 --- a/glibc/.footprint +++ b/glibc/.footprint @@ -1808,6 +1808,7 @@ drwxr-xr-x root/root usr/lib/getconf/ -rwxr-xr-x root/root usr/lib/getconf/POSIX_V6_LP64_OFF64 -rwxr-xr-x root/root usr/lib/getconf/POSIX_V7_LP64_OFF64 -rwxr-xr-x root/root usr/lib/getconf/XBS5_LP64_OFF64 +-rw-r--r-- root/root usr/lib/grcrt1.o -rw-r--r-- root/root usr/lib/libBrokenLocale.a lrwxrwxrwx root/root usr/lib/libBrokenLocale.so -> ../../lib/libBrokenLocale.so.1 -rw-r--r-- root/root usr/lib/libanl.a @@ -1850,6 +1851,7 @@ drwxr-xr-x root/root usr/lib/locale/C.UTF-8/LC_MESSAGES/ -rw-r--r-- root/root usr/lib/locale/C.UTF-8/LC_PAPER -rw-r--r-- root/root usr/lib/locale/C.UTF-8/LC_TELEPHONE -rw-r--r-- root/root usr/lib/locale/C.UTF-8/LC_TIME +-rw-r--r-- root/root usr/lib/rcrt1.o drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/iconvconfig -rwxr-xr-x root/root usr/sbin/nscd diff --git a/glibc/.signature b/glibc/.signature index bd8fc5fa..c4d85913 100644 --- a/glibc/.signature +++ b/glibc/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqsozTRDV/vcWiWnLcjSVyjxQsoKJ4wgr1nzXqbnuP7la1tdsE4lMoltdpLlaZQbJ9JEUAqVLTv3SdCCsCnrswwE= -SHA256 (Pkgfile) = d1a923df969562d06ad884aca886382c9afe02e8d755b3e98d7a7688723b73e4 -SHA256 (.footprint) = 3b81ac312f36b9a1b9747926394148836392409427be1c79cec9a0e99fe94758 +RWRJc1FUaeVeqiqQn/L6blltPfqoYH87QNphuxlDn26bBghaIS66xSjLqKY7z3BIz4rF2iHyHUdEJcD3VEZcT4A6G/jLu1C6Tgg= +SHA256 (Pkgfile) = f5914feb55935af17a6d394afa59296c6c75610a981cd7883c4265d952e9071e +SHA256 (.footprint) = c900eb05cc1dd9a27fa069d7b5fa0c3c53bb50aede29c484123415b17d082565 SHA256 (glibc-2.34.tar.xz) = 44d26a1fe20b8853a48f470ead01e4279e869ac149b195dda4e44a195d981ab2 SHA256 (linux-5.15.11.tar.xz) = c1178b7e7e12d91292e670191268e3fe9a3563faf899eef43e468577e973a1ce SHA256 (glibc-2.34-1.patch) = 38455bc201d53743b34335464a10d8ab2bfc456e71c49c116a58397ca48c7e2a diff --git a/glibc/Pkgfile b/glibc/Pkgfile index 3b16527f..d74af3d2 100644 --- a/glibc/Pkgfile +++ b/glibc/Pkgfile @@ -5,39 +5,42 @@ name=glibc version=2.34 release=1 -source=(https://ftp.gnu.org/gnu/glibc/glibc-$version.tar.xz \ - https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.11.tar.xz \ - glibc-$version-1.patch \ +_kernel_version=5.15.11 + +source=(https://ftp.gnu.org/gnu/glibc/glibc-$version.tar.xz + https://www.kernel.org/pub/linux/kernel/v5.x/linux-$_kernel_version.tar.xz + glibc-$version-1.patch hosts resolv.conf nsswitch.conf host.conf ld.so.conf) build() { # install kernel headers - cd linux-5.15.11 - make mrproper - make headers_check - make INSTALL_HDR_PATH=$PKG/usr headers_install + make -C $SRC/linux-$_kernel_version mrproper + make -C $SRC/linux-$_kernel_version headers_check + make -C $SRC/linux-$_kernel_version INSTALL_HDR_PATH=$PKG/usr headers_install chown root:root $PKG/usr patch -p1 -d $SRC/$name-${version:0:4} -i $SRC/$name-$version-1.patch mkdir $SRC/build cd $SRC/build - ../$name-${version}/configure \ + $SRC/$name-${version}/configure \ --prefix=/usr \ --libexecdir=/usr/lib \ --with-headers=$PKG/usr/include \ --enable-kernel=4.9 \ --enable-add-ons \ --enable-stack-protector=strong \ + --enable-static-pie \ + --enable-bind-now \ + --enable-multi-arch \ --disable-profile \ --disable-werror \ - --without-gd \ - --enable-multi-arch - make + --without-gd + make #make check make install_root=$PKG install - install -m 0644 $SRC/$name-${version:0:4}/nscd/nscd.conf $PKG/etc + install -m 0644 $SRC/$name-${version:0:4}/nscd/nscd.conf $PKG/etc install -d $PKG/var/{db,run}/nscd install -m 0644 $SRC/{hosts,resolv.conf,nsswitch.conf,host.conf,ld.so.conf} $PKG/etc diff --git a/glibc/post-install b/glibc/post-install index fae8589d..df44bb6c 100644 --- a/glibc/post-install +++ b/glibc/post-install @@ -1,4 +1,3 @@ #!/bin/sh /sbin/telinit U - |