From 8b4c9aad73a0ec3bcf2bc2c66a356fc829a487ec Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 31 Jan 2020 15:59:31 +0100 Subject: add package categories, defaulting to a/ --- build-template | 16 +++++++++++++--- def/a/bash | 6 ++++++ def/a/binutils | 9 +++++++++ def/a/bzip2 | 31 +++++++++++++++++++++++++++++++ def/a/coreutils | 6 ++++++ def/a/curl | 4 ++++ def/a/diffutils | 3 +++ def/a/file | 3 +++ def/a/findutils | 10 ++++++++++ def/a/gawk | 7 +++++++ def/a/gcc | 16 ++++++++++++++++ def/a/gmp | 3 +++ def/a/grep | 3 +++ def/a/gzip | 3 +++ def/a/libarchive | 3 +++ def/a/libressl | 3 +++ def/a/m4 | 3 +++ def/a/make | 3 +++ def/a/mpc | 3 +++ def/a/mpfr | 3 +++ def/a/musl | 13 +++++++++++++ def/a/patch | 5 +++++ def/a/sed | 3 +++ def/a/xz | 3 +++ def/a/zlib | 7 +++++++ def/bash | 6 ------ def/binutils | 9 --------- def/bzip2 | 31 ------------------------------- def/chroot-util-linux | 15 --------------- def/chroot/util-linux | 15 +++++++++++++++ def/coreutils | 6 ------ def/curl | 4 ---- def/diffutils | 3 --- def/file | 3 --- def/findutils | 10 ---------- def/gawk | 7 ------- def/gcc | 16 ---------------- def/gmp | 3 --- def/grep | 3 --- def/gzip | 3 --- def/libarchive | 3 --- def/libressl | 3 --- def/m4 | 3 --- def/make | 3 --- def/mpc | 3 --- def/mpfr | 3 --- def/musl | 13 ------------- def/patch | 5 ----- def/sed | 3 --- def/xz | 3 --- def/zlib | 7 ------- install-pkg | 5 +---- lib2.sh | 3 ++- 53 files changed, 184 insertions(+), 176 deletions(-) create mode 100644 def/a/bash create mode 100644 def/a/binutils create mode 100644 def/a/bzip2 create mode 100644 def/a/coreutils create mode 100644 def/a/curl create mode 100644 def/a/diffutils create mode 100644 def/a/file create mode 100644 def/a/findutils create mode 100644 def/a/gawk create mode 100644 def/a/gcc create mode 100644 def/a/gmp create mode 100644 def/a/grep create mode 100644 def/a/gzip create mode 100644 def/a/libarchive create mode 100644 def/a/libressl create mode 100644 def/a/m4 create mode 100644 def/a/make create mode 100644 def/a/mpc create mode 100644 def/a/mpfr create mode 100644 def/a/musl create mode 100644 def/a/patch create mode 100644 def/a/sed create mode 100644 def/a/xz create mode 100644 def/a/zlib delete mode 100644 def/bash delete mode 100644 def/binutils delete mode 100644 def/bzip2 delete mode 100644 def/chroot-util-linux create mode 100644 def/chroot/util-linux delete mode 100644 def/coreutils delete mode 100644 def/curl delete mode 100644 def/diffutils delete mode 100644 def/file delete mode 100644 def/findutils delete mode 100644 def/gawk delete mode 100644 def/gcc delete mode 100644 def/gmp delete mode 100644 def/grep delete mode 100644 def/gzip delete mode 100644 def/libarchive delete mode 100644 def/libressl delete mode 100644 def/m4 delete mode 100644 def/make delete mode 100644 def/mpc delete mode 100644 def/mpfr delete mode 100644 def/musl delete mode 100644 def/patch delete mode 100644 def/sed delete mode 100644 def/xz delete mode 100644 def/zlib diff --git a/build-template b/build-template index 5fe652c..7d51a3a 100755 --- a/build-template +++ b/build-template @@ -3,11 +3,21 @@ rm -rf dst mkdir dst -cat lib1.sh $1 lib2.sh | ./enter-newroot +x=$1 +pkgname=${x##*/} +x=${x%/*} +pkgcat=${x##*/} -for d in dst/*/*; do +{ + echo "export pkgname=$pkgname pkgcat=$pkgcat;" + cat lib1.sh $1 lib2.sh +} | ./enter-newroot + +for d in dst/$pkgcat/$pkgname/*; do [ -d "$d" ] || continue - tar czvf pkg/$( echo "$d" | sed 's/^dst\///; s:/:@:g' ).tar.xz -C $d . --sort=name --mtime="@0" --owner=0 --group=0 --numeric-owner + mkdir -p pkg/$pkgcat + tar czvf pkg/$pkgcat/$pkgname@${d##*/}.tar.xz -C dst $pkgcat/$pkgname \ + --sort=name --mtime="@0" --owner=0 --group=0 --numeric-owner echo $d done diff --git a/def/a/bash b/def/a/bash new file mode 100644 index 0000000..0ab65a1 --- /dev/null +++ b/def/a/bash @@ -0,0 +1,6 @@ +pkgname=bash +version=5.0 +distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.gz" +# XXX add patches +configure_args="--without-bash-malloc --without-curses + --without-installed-readline --disable-nls bash_cv_termcap_lib=gnutermcap" diff --git a/def/a/binutils b/def/a/binutils new file mode 100644 index 0000000..1f97a66 --- /dev/null +++ b/def/a/binutils @@ -0,0 +1,9 @@ +pkgname=binutils +version=2.33.1 +distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.xz" +configure_args="--build=x86_64-linux-musl --enable-threads + --enable-plugins --enable-secureplt --with-mmap + --disable-shared --enable-gold --disable-werror + --enable-deterministic-archives --enable-ld=default + --disable-nls" +make_install_args="tooldir=/usr" diff --git a/def/a/bzip2 b/def/a/bzip2 new file mode 100644 index 0000000..00c66db --- /dev/null +++ b/def/a/bzip2 @@ -0,0 +1,31 @@ +pkgname=bzip2 +version=1.0.8 +distfiles="https://sourceware.org/pub/${pkgname}/${pkgname}-${version}.tar.gz" + +do_build() { + make ${makejobs} CFLAGS="$CFLAGS -fPIC $LDFLAGS" LDFLAGS="$LDFLAGS" -f Makefile-libbz2_so + make ${makejobs} CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" bzip2recover libbz2.a +} + +do_install() { + # XXX ugly + + install -Dm755 bzip2-shared $DESTDIR/usr/bin/bzip2 + install -Dm755 bzip2recover $DESTDIR/usr/bin/ + ln -sf bzip2 ${DESTDIR}/usr/bin/bunzip2 + ln -sf bzip2 ${DESTDIR}/usr/bin/bzcat + install -m755 bzdiff bzgrep bzmore ${DESTDIR}/usr/bin + + install -Dm644 libbz2.so.${version} ${DESTDIR}/usr/lib/libbz2.so.${version} + ln -s libbz2.so.${version} ${DESTDIR}/usr/lib/libbz2.so + ln -s libbz2.so.${version} ${DESTDIR}/usr/lib/libbz2.so.1 + ln -s libbz2.so.${version} ${DESTDIR}/usr/lib/libbz2.so.1.0 + + install -Dm644 libbz2.a ${DESTDIR}/usr/lib/libbz2.a + install -Dm644 bzlib.h ${DESTDIR}/usr/include/bzlib.h + + install -Dm644 bzip2.1 ${DESTDIR}/usr/share/man/man1/bzip2.1 + ln -sf bzip2.1 ${DESTDIR}/usr/share/man/man1/bunzip2.1 + ln -sf bzip2.1 ${DESTDIR}/usr/share/man/man1/bzcat.1 + ln -sf bzip2.1 ${DESTDIR}/usr/share/man/man1/bzip2recover.1 +} diff --git a/def/a/coreutils b/def/a/coreutils new file mode 100644 index 0000000..8a9ef4e --- /dev/null +++ b/def/a/coreutils @@ -0,0 +1,6 @@ +pkgname=coreutils +version=8.31 +distfiles="http://ftp.gnu.org/gnu/coreutils/coreutils-8.31.tar.xz" +configure_args=" --enable-install-program=arch,hostname + --enable-no-install-program=kill,uptime + --disable-rpath" diff --git a/def/a/curl b/def/a/curl new file mode 100644 index 0000000..a780cc7 --- /dev/null +++ b/def/a/curl @@ -0,0 +1,4 @@ +pkgname=curl +version=7.68.0 +distfiles="https://curl.haxx.se/download/curl-7.67.0.tar.bz2" +configure_args="--with-ssl --with-zlib" diff --git a/def/a/diffutils b/def/a/diffutils new file mode 100644 index 0000000..1b1a8e5 --- /dev/null +++ b/def/a/diffutils @@ -0,0 +1,3 @@ +pkgname=diffutils +version=3.7 +distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.xz" diff --git a/def/a/file b/def/a/file new file mode 100644 index 0000000..11b61f1 --- /dev/null +++ b/def/a/file @@ -0,0 +1,3 @@ +pkgname=file +version=5.37 +distfiles="ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${version}.tar.gz" diff --git a/def/a/findutils b/def/a/findutils new file mode 100644 index 0000000..7305e9d --- /dev/null +++ b/def/a/findutils @@ -0,0 +1,10 @@ +pkgname=findutils +version=4.7.0 +distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.xz" + +post_extract() { + sed -i '/SUBDIRS/s/locate//' Makefile.in +} +pre_build() { + make -C locate dblocation.texi +} diff --git a/def/a/gawk b/def/a/gawk new file mode 100644 index 0000000..664bead --- /dev/null +++ b/def/a/gawk @@ -0,0 +1,7 @@ +pkgname=gawk +version=5.0.1 +distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.xz" + +post_install() { + rm -rf ${DESTDIR}/usr/etc +} diff --git a/def/a/gcc b/def/a/gcc new file mode 100644 index 0000000..56d8d8e --- /dev/null +++ b/def/a/gcc @@ -0,0 +1,16 @@ +pkgname=gcc +version=9.2.0 +distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.xz" + +configure_args="--enable-languages=c,c++,lto --disable-multilib --disable-libsanitizer --build=x86_64-linux-musl" + +post_extract() { + # disable fixinc crap + sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in + + # use lib not lib64 by default + sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64 + sed -i 's/lib64/lib/' gcc/config/i386/linux64.h +} + +# XXX posix c89 wrappers diff --git a/def/a/gmp b/def/a/gmp new file mode 100644 index 0000000..dc00b4d --- /dev/null +++ b/def/a/gmp @@ -0,0 +1,3 @@ +pkgname=gmp +version=6.1.2 +distfiles="http://gmplib.org/download/${pkgname}/${pkgname}-${version}.tar.xz" diff --git a/def/a/grep b/def/a/grep new file mode 100644 index 0000000..5e7b10f --- /dev/null +++ b/def/a/grep @@ -0,0 +1,3 @@ +pkgname=grep +version=3.3 +distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.xz" diff --git a/def/a/gzip b/def/a/gzip new file mode 100644 index 0000000..f9d008e --- /dev/null +++ b/def/a/gzip @@ -0,0 +1,3 @@ +pkgname=gzip +version=1.10 +distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.xz" diff --git a/def/a/libarchive b/def/a/libarchive new file mode 100644 index 0000000..fd3eadf --- /dev/null +++ b/def/a/libarchive @@ -0,0 +1,3 @@ +pkgname=libarchive +version=3.4.0 +distfiles="https://github.com/libarchive/libarchive/releases/download/v${version}/libarchive-${version}.tar.gz" diff --git a/def/a/libressl b/def/a/libressl new file mode 100644 index 0000000..aea9f10 --- /dev/null +++ b/def/a/libressl @@ -0,0 +1,3 @@ +pkgname=libressl +version=3.0.2 +distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz" diff --git a/def/a/m4 b/def/a/m4 new file mode 100644 index 0000000..d70b61f --- /dev/null +++ b/def/a/m4 @@ -0,0 +1,3 @@ +pkgname=m4 +version=1.4.18 +distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.xz" diff --git a/def/a/make b/def/a/make new file mode 100644 index 0000000..824f7e9 --- /dev/null +++ b/def/a/make @@ -0,0 +1,3 @@ +pkgname=make +version=4.2.1 +distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.bz2" diff --git a/def/a/mpc b/def/a/mpc new file mode 100644 index 0000000..6a91e23 --- /dev/null +++ b/def/a/mpc @@ -0,0 +1,3 @@ +pkgname=mpc +version=1.1.0 +distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.gz" diff --git a/def/a/mpfr b/def/a/mpfr new file mode 100644 index 0000000..6be4b72 --- /dev/null +++ b/def/a/mpfr @@ -0,0 +1,3 @@ +pkgname=mpfr +version=4.0.2 +distfiles="http://www.mpfr.org/${pkgname}-${version}/${pkgname}-${version}.tar.xz" diff --git a/def/a/musl b/def/a/musl new file mode 100644 index 0000000..dfe73d4 --- /dev/null +++ b/def/a/musl @@ -0,0 +1,13 @@ +pkgname=musl +version=1.1.24 +configure_args="--prefix=/usr --disable-gcc-wrapper" +distfiles="http://www.musl-libc.org/releases/${pkgname}-${version}.tar.gz" + +do_install() { + mkdir -p $DESTDIR/usr/lib $DESTDIR/usr/bin + ln -sfr ${DESTDIR}/usr/lib ${DESTDIR}/lib + make DESTDIR=${DESTDIR} install + rm ${DESTDIR}/lib + ln -s /usr/lib/libc.so ${DESTDIR}/usr/bin/ldd + ln -s true ${DESTDIR}/usr/bin/ldconfig +} diff --git a/def/a/patch b/def/a/patch new file mode 100644 index 0000000..b99aea5 --- /dev/null +++ b/def/a/patch @@ -0,0 +1,5 @@ +pkgname=patch +version=2.7.6 +distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.xz" +# XXX many CVE unpatched +# XXX ./usr/lib/charset.alias diff --git a/def/a/sed b/def/a/sed new file mode 100644 index 0000000..847ab9f --- /dev/null +++ b/def/a/sed @@ -0,0 +1,3 @@ +pkgname=sed +version=4.7 +distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.xz" diff --git a/def/a/xz b/def/a/xz new file mode 100644 index 0000000..c9e3802 --- /dev/null +++ b/def/a/xz @@ -0,0 +1,3 @@ +pkgname=xz +version=5.2.4 +distfiles="https://tukaani.org/${pkgname}/${pkgname}-${version}.tar.bz2" diff --git a/def/a/zlib b/def/a/zlib new file mode 100644 index 0000000..c7a4824 --- /dev/null +++ b/def/a/zlib @@ -0,0 +1,7 @@ +pkgname=zlib +version=1.2.11 +distfiles="http://www.zlib.net/${pkgname}-${version}.tar.gz" + +do_configure() { + LDFLAGS= LDSHAREDLIBC= ./configure --prefix=/usr --shared +} diff --git a/def/bash b/def/bash deleted file mode 100644 index 0ab65a1..0000000 --- a/def/bash +++ /dev/null @@ -1,6 +0,0 @@ -pkgname=bash -version=5.0 -distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.gz" -# XXX add patches -configure_args="--without-bash-malloc --without-curses - --without-installed-readline --disable-nls bash_cv_termcap_lib=gnutermcap" diff --git a/def/binutils b/def/binutils deleted file mode 100644 index 1f97a66..0000000 --- a/def/binutils +++ /dev/null @@ -1,9 +0,0 @@ -pkgname=binutils -version=2.33.1 -distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.xz" -configure_args="--build=x86_64-linux-musl --enable-threads - --enable-plugins --enable-secureplt --with-mmap - --disable-shared --enable-gold --disable-werror - --enable-deterministic-archives --enable-ld=default - --disable-nls" -make_install_args="tooldir=/usr" diff --git a/def/bzip2 b/def/bzip2 deleted file mode 100644 index 00c66db..0000000 --- a/def/bzip2 +++ /dev/null @@ -1,31 +0,0 @@ -pkgname=bzip2 -version=1.0.8 -distfiles="https://sourceware.org/pub/${pkgname}/${pkgname}-${version}.tar.gz" - -do_build() { - make ${makejobs} CFLAGS="$CFLAGS -fPIC $LDFLAGS" LDFLAGS="$LDFLAGS" -f Makefile-libbz2_so - make ${makejobs} CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" bzip2recover libbz2.a -} - -do_install() { - # XXX ugly - - install -Dm755 bzip2-shared $DESTDIR/usr/bin/bzip2 - install -Dm755 bzip2recover $DESTDIR/usr/bin/ - ln -sf bzip2 ${DESTDIR}/usr/bin/bunzip2 - ln -sf bzip2 ${DESTDIR}/usr/bin/bzcat - install -m755 bzdiff bzgrep bzmore ${DESTDIR}/usr/bin - - install -Dm644 libbz2.so.${version} ${DESTDIR}/usr/lib/libbz2.so.${version} - ln -s libbz2.so.${version} ${DESTDIR}/usr/lib/libbz2.so - ln -s libbz2.so.${version} ${DESTDIR}/usr/lib/libbz2.so.1 - ln -s libbz2.so.${version} ${DESTDIR}/usr/lib/libbz2.so.1.0 - - install -Dm644 libbz2.a ${DESTDIR}/usr/lib/libbz2.a - install -Dm644 bzlib.h ${DESTDIR}/usr/include/bzlib.h - - install -Dm644 bzip2.1 ${DESTDIR}/usr/share/man/man1/bzip2.1 - ln -sf bzip2.1 ${DESTDIR}/usr/share/man/man1/bunzip2.1 - ln -sf bzip2.1 ${DESTDIR}/usr/share/man/man1/bzcat.1 - ln -sf bzip2.1 ${DESTDIR}/usr/share/man/man1/bzip2recover.1 -} diff --git a/def/chroot-util-linux b/def/chroot-util-linux deleted file mode 100644 index 61a5cb6..0000000 --- a/def/chroot-util-linux +++ /dev/null @@ -1,15 +0,0 @@ -pkgname=chroot-util-linux -version=2.32.1 -distfiles="https://www.kernel.org/pub/linux/utils/util-linux/v${version%.*}/util-linux-${version}.tar.xz" -configure_args=" - --without-ncurses --without-ncursesw --without-udev - --without-systemd --disable-libuuid --disable-libblkid --disable-libmount - --disable-mount --disable-losetup --disable-fsck --disable-partx --disable-uuidd - --disable-mountpoint --disable-fallocate --disable-unshare --disable-nls - --disable-wall --disable-chfn-chsh-password --disable-su --disable-sulogin - --disable-login --disable-runuser --disable-setpriv --disable-libsmartcols" - -post_install() { - rm -rf ${DESTDIR}/sbin - rm -rf ${DESTDIR}/usr/sbin -} diff --git a/def/chroot/util-linux b/def/chroot/util-linux new file mode 100644 index 0000000..499c70e --- /dev/null +++ b/def/chroot/util-linux @@ -0,0 +1,15 @@ +pkgname=util-linux +version=2.32.1 +distfiles="https://www.kernel.org/pub/linux/utils/${pkgname}/v${version%.*}/${pkgname}-${version}.tar.xz" +configure_args=" + --without-ncurses --without-ncursesw --without-udev + --without-systemd --disable-libuuid --disable-libblkid --disable-libmount + --disable-mount --disable-losetup --disable-fsck --disable-partx --disable-uuidd + --disable-mountpoint --disable-fallocate --disable-unshare --disable-nls + --disable-wall --disable-chfn-chsh-password --disable-su --disable-sulogin + --disable-login --disable-runuser --disable-setpriv --disable-libsmartcols" + +post_install() { + rm -rf ${DESTDIR}/sbin + rm -rf ${DESTDIR}/usr/sbin +} diff --git a/def/coreutils b/def/coreutils deleted file mode 100644 index 8a9ef4e..0000000 --- a/def/coreutils +++ /dev/null @@ -1,6 +0,0 @@ -pkgname=coreutils -version=8.31 -distfiles="http://ftp.gnu.org/gnu/coreutils/coreutils-8.31.tar.xz" -configure_args=" --enable-install-program=arch,hostname - --enable-no-install-program=kill,uptime - --disable-rpath" diff --git a/def/curl b/def/curl deleted file mode 100644 index a780cc7..0000000 --- a/def/curl +++ /dev/null @@ -1,4 +0,0 @@ -pkgname=curl -version=7.68.0 -distfiles="https://curl.haxx.se/download/curl-7.67.0.tar.bz2" -configure_args="--with-ssl --with-zlib" diff --git a/def/diffutils b/def/diffutils deleted file mode 100644 index 1b1a8e5..0000000 --- a/def/diffutils +++ /dev/null @@ -1,3 +0,0 @@ -pkgname=diffutils -version=3.7 -distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.xz" diff --git a/def/file b/def/file deleted file mode 100644 index 11b61f1..0000000 --- a/def/file +++ /dev/null @@ -1,3 +0,0 @@ -pkgname=file -version=5.37 -distfiles="ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${version}.tar.gz" diff --git a/def/findutils b/def/findutils deleted file mode 100644 index 7305e9d..0000000 --- a/def/findutils +++ /dev/null @@ -1,10 +0,0 @@ -pkgname=findutils -version=4.7.0 -distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.xz" - -post_extract() { - sed -i '/SUBDIRS/s/locate//' Makefile.in -} -pre_build() { - make -C locate dblocation.texi -} diff --git a/def/gawk b/def/gawk deleted file mode 100644 index 664bead..0000000 --- a/def/gawk +++ /dev/null @@ -1,7 +0,0 @@ -pkgname=gawk -version=5.0.1 -distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.xz" - -post_install() { - rm -rf ${DESTDIR}/usr/etc -} diff --git a/def/gcc b/def/gcc deleted file mode 100644 index 56d8d8e..0000000 --- a/def/gcc +++ /dev/null @@ -1,16 +0,0 @@ -pkgname=gcc -version=9.2.0 -distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.xz" - -configure_args="--enable-languages=c,c++,lto --disable-multilib --disable-libsanitizer --build=x86_64-linux-musl" - -post_extract() { - # disable fixinc crap - sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - - # use lib not lib64 by default - sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64 - sed -i 's/lib64/lib/' gcc/config/i386/linux64.h -} - -# XXX posix c89 wrappers diff --git a/def/gmp b/def/gmp deleted file mode 100644 index dc00b4d..0000000 --- a/def/gmp +++ /dev/null @@ -1,3 +0,0 @@ -pkgname=gmp -version=6.1.2 -distfiles="http://gmplib.org/download/${pkgname}/${pkgname}-${version}.tar.xz" diff --git a/def/grep b/def/grep deleted file mode 100644 index 5e7b10f..0000000 --- a/def/grep +++ /dev/null @@ -1,3 +0,0 @@ -pkgname=grep -version=3.3 -distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.xz" diff --git a/def/gzip b/def/gzip deleted file mode 100644 index f9d008e..0000000 --- a/def/gzip +++ /dev/null @@ -1,3 +0,0 @@ -pkgname=gzip -version=1.10 -distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.xz" diff --git a/def/libarchive b/def/libarchive deleted file mode 100644 index fd3eadf..0000000 --- a/def/libarchive +++ /dev/null @@ -1,3 +0,0 @@ -pkgname=libarchive -version=3.4.0 -distfiles="https://github.com/libarchive/libarchive/releases/download/v${version}/libarchive-${version}.tar.gz" diff --git a/def/libressl b/def/libressl deleted file mode 100644 index aea9f10..0000000 --- a/def/libressl +++ /dev/null @@ -1,3 +0,0 @@ -pkgname=libressl -version=3.0.2 -distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz" diff --git a/def/m4 b/def/m4 deleted file mode 100644 index d70b61f..0000000 --- a/def/m4 +++ /dev/null @@ -1,3 +0,0 @@ -pkgname=m4 -version=1.4.18 -distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.xz" diff --git a/def/make b/def/make deleted file mode 100644 index 824f7e9..0000000 --- a/def/make +++ /dev/null @@ -1,3 +0,0 @@ -pkgname=make -version=4.2.1 -distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.bz2" diff --git a/def/mpc b/def/mpc deleted file mode 100644 index 6a91e23..0000000 --- a/def/mpc +++ /dev/null @@ -1,3 +0,0 @@ -pkgname=mpc -version=1.1.0 -distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.gz" diff --git a/def/mpfr b/def/mpfr deleted file mode 100644 index 6be4b72..0000000 --- a/def/mpfr +++ /dev/null @@ -1,3 +0,0 @@ -pkgname=mpfr -version=4.0.2 -distfiles="http://www.mpfr.org/${pkgname}-${version}/${pkgname}-${version}.tar.xz" diff --git a/def/musl b/def/musl deleted file mode 100644 index dfe73d4..0000000 --- a/def/musl +++ /dev/null @@ -1,13 +0,0 @@ -pkgname=musl -version=1.1.24 -configure_args="--prefix=/usr --disable-gcc-wrapper" -distfiles="http://www.musl-libc.org/releases/${pkgname}-${version}.tar.gz" - -do_install() { - mkdir -p $DESTDIR/usr/lib $DESTDIR/usr/bin - ln -sfr ${DESTDIR}/usr/lib ${DESTDIR}/lib - make DESTDIR=${DESTDIR} install - rm ${DESTDIR}/lib - ln -s /usr/lib/libc.so ${DESTDIR}/usr/bin/ldd - ln -s true ${DESTDIR}/usr/bin/ldconfig -} diff --git a/def/patch b/def/patch deleted file mode 100644 index b99aea5..0000000 --- a/def/patch +++ /dev/null @@ -1,5 +0,0 @@ -pkgname=patch -version=2.7.6 -distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.xz" -# XXX many CVE unpatched -# XXX ./usr/lib/charset.alias diff --git a/def/sed b/def/sed deleted file mode 100644 index 847ab9f..0000000 --- a/def/sed +++ /dev/null @@ -1,3 +0,0 @@ -pkgname=sed -version=4.7 -distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.xz" diff --git a/def/xz b/def/xz deleted file mode 100644 index c9e3802..0000000 --- a/def/xz +++ /dev/null @@ -1,3 +0,0 @@ -pkgname=xz -version=5.2.4 -distfiles="https://tukaani.org/${pkgname}/${pkgname}-${version}.tar.bz2" diff --git a/def/zlib b/def/zlib deleted file mode 100644 index c7a4824..0000000 --- a/def/zlib +++ /dev/null @@ -1,7 +0,0 @@ -pkgname=zlib -version=1.2.11 -distfiles="http://www.zlib.net/${pkgname}-${version}.tar.gz" - -do_configure() { - LDFLAGS= LDSHAREDLIBC= ./configure --prefix=/usr --shared -} diff --git a/install-pkg b/install-pkg index 2201c96..619d821 100755 --- a/install-pkg +++ b/install-pkg @@ -2,8 +2,5 @@ set -e for pkg; do - name=${pkg##*/} - name=${name%.tar.xz} - mkdir -p newroot/pkg/$(echo "$name" | sed 's:@:/:g') - tar xf $pkg -C newroot/pkg/$(echo "$name" | sed 's:@:/:g') + tar xf $pkg -C newroot/pkg/ done diff --git a/lib2.sh b/lib2.sh index ea7cbe0..a4e3cea 100644 --- a/lib2.sh +++ b/lib2.sh @@ -1,3 +1,4 @@ +[ -z "$pkgcat" ] && error "pkgcat unset" [ -z "$pkgname" ] && error "pkgname unset" [ -z "$version" ] && error "version unset" @@ -13,7 +14,7 @@ configure_args="--prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --bindir=/usr : ${LDFLAGS:=-Wl,-z,relro -Wl,-z,now} : ${make_install_target:=install} : ${make_install_args:=} -: ${DESTDIR:=/dst/$pkgname/$version} +: ${DESTDIR:=/dst/$pkgcat/$pkgname/$version} for s in fetch extract configure build check install; do verbose pre_$s -- cgit 1.4.1