diff --git a/src/expat/pkg.sh b/src/expat/pkg.sh index c7c34da..896af8e 100644 --- a/src/expat/pkg.sh +++ b/src/expat/pkg.sh @@ -20,7 +20,7 @@ PACKAGE(){ --disable-static \ --docdir="/usr/share/doc/expat-${VERSION}" make && make DESTDIR="${ROOTDIR}" install - install -v -m644 doc/*.{html,css} "/usr/share/doc/expat-${VERSION}" + install -v -m644 doc/*.{html,css} "${ROOTDIR}/usr/share/doc/expat-${VERSION}" cd .. && rm -r "${NAME}-${VERSION}" } diff --git a/src/glibc/pkg.sh b/src/glibc/pkg.sh index 58d7c3f..5c4229c 100644 --- a/src/glibc/pkg.sh +++ b/src/glibc/pkg.sh @@ -39,7 +39,7 @@ PACKAGE(){ --with-headers=/usr/include \ libc_cv_slibdir=/usr/lib && make - mkdir "${ROOTDIR}/etc" + install -dm755 "${ROOTDIR}/etc" touch "${ROOTDIR}/etc/ld.so.conf" sed '/test-installation/s@$(PERL)@echo not running@' -i ../Makefile @@ -47,9 +47,9 @@ PACKAGE(){ sed '/RTLDLIST=/s@/usr@@g' -i "${ROOTDIR}/usr/bin/ldd" cp ../nscd/nscd.conf "${ROOTDIR}/etc/nscd.conf" - mkdir -p "${ROOTDIR}/var/cache/nscd" + install -dm755 "${ROOTDIR}/var/cache/nscd" - make DESTDIR="${ROOTDIR}" localedata/install-locale + make DESTDIR="${ROOTDIR}" localedata/install-locales install -m644 "${ROOTDIR}/nsswitch.conf" "${ROOTDIR}/etc/nsswitch.conf" install -m644 "${ROOTDIR}/ld.so.conf" "${ROOTDIR}/etc/ld.so.conf" diff --git a/src/grep/.cache/last b/src/grep/.cache/last index a50041e..e14e744 100644 --- a/src/grep/.cache/last +++ b/src/grep/.cache/last @@ -1,2 +1,2 @@ -887a9e7065789d9d1b4dcd6c4f733779 +cb01aa22e6c6be2065f9f3794d06baf9 f1d5924af55a63998ee131fd1f8d1132 diff --git a/src/linux/pkg.sh b/src/linux/pkg.sh index 0d66969..ee27b2b 100644 --- a/src/linux/pkg.sh +++ b/src/linux/pkg.sh @@ -18,12 +18,13 @@ DEPENDS=() BUILD=() PACKAGE(){ - tar xf "${NAME}-${VERSION}.tar.xz" + tar xf "${NAME}-libre-${VERSION}-gnu.tar.xz" cd "linux-${VERSION}" cp "${ROOTDIR}/config" .config mkdir -pv "${ROOTDIR}/"{boot,usr} + make olddefconfig make make INSTALL_MOD_PATH="${ROOTDIR}/usr" INSTALL_MOD_STRIP=1 modules_install cp -iv arch/x86/boot/bzImage "${ROOTDIR}/boot/vmlinuz-linux" diff --git a/src/make-ca/pkg.sh b/src/make-ca/pkg.sh index e222870..f75415e 100644 --- a/src/make-ca/pkg.sh +++ b/src/make-ca/pkg.sh @@ -10,7 +10,7 @@ FILES=( ) HASHES=( "6391698fe6db16eb190da1aba802bc90c09c8baa4c116d9c65647bea87f190db" - "4c933cfd2327b2a381542f3cb6392179d5e359811f5274734e8dc7e28e587b61" + "1642deeff826665a04972ea379ff9da0317591dfb584af7ca863537f3634f124" ) # install and build depends diff --git a/src/ncurses/pkg.sh b/src/ncurses/pkg.sh index 70543ac..cd9570b 100644 --- a/src/ncurses/pkg.sh +++ b/src/ncurses/pkg.sh @@ -37,7 +37,7 @@ PACKAGE(){ for lib in ncurses form panel menu ; do rm -vf "${ROOTDIR}/usr/lib/lib${lib}.so" echo "INPUT(-l${lib}w)" > "${ROOTDIR}/usr/lib/lib${lib}.so" - ln -sfv1 "${lib}w.pc" "${ROOTDIR}/usr/lib/pkgconfig/${lib}.pc" + ln -sfv "${lib}w.pc" "${ROOTDIR}/usr/lib/pkgconfig/${lib}.pc" done cp -v -R doc -T "${ROOTDIR}/usr/share/doc/ncurses-${VERSION}" diff --git a/src/readline/pkg.sh b/src/readline/pkg.sh index ea8c2c0..09b75df 100644 --- a/src/readline/pkg.sh +++ b/src/readline/pkg.sh @@ -23,7 +23,7 @@ PACKAGE(){ sed -i '/MV.*old/d' Makefile.in sed -i '/{OLDSUFF}/c:' support/shlib-install - patch -Np1 -i "../readline-${VERSION}-upstream_fix-1.patch" + patch -Np1 -i "../readline-${VERSION}-upstream_fixes-3.patch" ./configure --prefix=/usr \ --disable-static \ diff --git a/src/xz/pkg.sh b/src/xz/pkg.sh index 0d3786f..e0b45cf 100644 --- a/src/xz/pkg.sh +++ b/src/xz/pkg.sh @@ -15,6 +15,7 @@ PACKAGE(){ tar xf "v${VERSION}.tar.gz" cd "${NAME}-${VERSION}" + autoreconf -fiv ./configure --prefix=/usr \ --disable-static \ --docdir="/usr/share/doc/xz-${VERSION}"