From fab6a7deae6de10f548125d28606ecf8e07054a4 Mon Sep 17 00:00:00 2001 From: emmett1 Date: Thu, 2 Jul 2020 23:33:24 +0800 Subject: [PATCH] updated --- 02-base | 2 +- 03-mkiso | 12 +-- LICENSE | 0 README.md | 0 enter-chroot | 97 +++++++++++++++++++ files/core.httpup | 0 files/grub.cfg | 0 .../lfs-bootscripts_add-support-uefi.patch | 0 .../pkgutils_fix-build-needed-trigger.patch | 0 ports/core/.httpup-repgen-ignore | 0 ports/core/REPO | 0 ports/core/dbus/update | 0 ports/core/efibootmgr/update | 0 ...6d78a7fb5f6c5fb4a1d646040539db6cf865.patch | 0 ...a8921010d03f46704a476c69861515deb1ca.patch | 0 ...53db85ff10890209d0fe48fb4856ad68e4e0.patch | 0 ports/core/filesystem/group | 0 ports/core/filesystem/issue | 0 ports/core/filesystem/passwd | 0 ports/core/flex/update | 0 ports/core/fuse2/update | 0 ports/core/gpm/update | 0 ports/core/less/update | 0 .../lfs-bootscripts_add-support-uefi.patch | 0 ports/core/libevent/update | 0 ports/core/libnl/update | 0 ports/core/linux-firmware/update | 0 ports/core/linux/config | 0 ports/core/linux/post-install | 11 +++ ports/core/mtools/Pkgfile | 21 ++++ ports/core/perl/update | 0 ports/core/pkgutils/pkgmk.conf | 2 +- .../pkgutils_fix-build-needed-trigger.patch | 0 ports/core/ports/core.httpup | 0 ports/core/python3/update | 0 ports/core/syslinux/Pkgfile | 19 ++++ .../syslinux/syslinux-6.03-sysmacros.patch | 34 +++++++ ports/core/tzdata/update | 0 rootfs/etc/issue | 0 rootfs/root/README | 4 +- toolchain/03-linux-api-headers | 7 +- toolchain/{11-m4 => 08-m4} | 0 toolchain/08-tcl | 15 --- toolchain/09-expect | 15 --- toolchain/{12-ncurses => 09-ncurses} | 3 +- toolchain/{13-bash => 10-bash} | 1 - toolchain/10-dejagnu | 9 -- toolchain/{14-bison => 11-bison} | 1 - toolchain/{15-bzip2 => 12-bzip2} | 0 toolchain/{16-coreutils => 13-coreutils} | 0 toolchain/{17-diffutils => 14-diffutils} | 0 toolchain/{18-file => 15-file} | 0 toolchain/16-findutils | 10 ++ toolchain/{20-gawk => 17-gawk} | 0 toolchain/{21-gettext => 18-gettext} | 0 toolchain/19-findutils | 16 --- toolchain/{22-grep => 19-grep} | 0 toolchain/{23-gzip => 20-gzip} | 5 - toolchain/{24-make => 21-make} | 1 - toolchain/{25-patch => 22-patch} | 0 toolchain/{26-perl => 23-perl} | 0 toolchain/{27-python => 24-python} | 0 toolchain/{28-sed => 25-sed} | 0 toolchain/{29-tar => 26-tar} | 0 toolchain/{30-texinfo => 27-texinfo} | 0 toolchain/{31-xz => 28-xz} | 0 toolchain/{32-openssl => 29-openssl} | 0 toolchain/{33-certs => 30-certs} | 0 toolchain/{34-curl => 31-curl} | 0 toolchain/{36-libarchive => 32-libarchive} | 2 +- toolchain/{41-pkgutils => 33-pkgutils} | 4 + toolchain/35-zlib | 10 -- toolchain/37-attr | 10 -- toolchain/38-acl | 10 -- toolchain/39-expat | 10 -- toolchain/40-lz4 | 9 -- toolchain/42-wget | 17 ---- 77 files changed, 214 insertions(+), 143 deletions(-) mode change 100644 => 100755 LICENSE mode change 100644 => 100755 README.md create mode 100755 enter-chroot mode change 100644 => 100755 files/core.httpup mode change 100644 => 100755 files/grub.cfg mode change 100644 => 100755 patches/lfs-bootscripts_add-support-uefi.patch mode change 100644 => 100755 patches/pkgutils_fix-build-needed-trigger.patch mode change 100644 => 100755 ports/core/.httpup-repgen-ignore mode change 100644 => 100755 ports/core/REPO mode change 100644 => 100755 ports/core/dbus/update mode change 100644 => 100755 ports/core/efibootmgr/update mode change 100644 => 100755 ports/core/efivar/0dad6d78a7fb5f6c5fb4a1d646040539db6cf865.patch mode change 100644 => 100755 ports/core/efivar/b98ba8921010d03f46704a476c69861515deb1ca.patch mode change 100644 => 100755 ports/core/efivar/c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch mode change 100644 => 100755 ports/core/filesystem/group mode change 100644 => 100755 ports/core/filesystem/issue mode change 100644 => 100755 ports/core/filesystem/passwd mode change 100644 => 100755 ports/core/flex/update mode change 100644 => 100755 ports/core/fuse2/update mode change 100644 => 100755 ports/core/gpm/update mode change 100644 => 100755 ports/core/less/update mode change 100644 => 100755 ports/core/lfs-bootscripts/lfs-bootscripts_add-support-uefi.patch mode change 100644 => 100755 ports/core/libevent/update mode change 100644 => 100755 ports/core/libnl/update mode change 100644 => 100755 ports/core/linux-firmware/update mode change 100644 => 100755 ports/core/linux/config create mode 100755 ports/core/linux/post-install create mode 100755 ports/core/mtools/Pkgfile mode change 100644 => 100755 ports/core/perl/update mode change 100644 => 100755 ports/core/pkgutils/pkgutils_fix-build-needed-trigger.patch mode change 100644 => 100755 ports/core/ports/core.httpup mode change 100644 => 100755 ports/core/python3/update create mode 100755 ports/core/syslinux/Pkgfile create mode 100755 ports/core/syslinux/syslinux-6.03-sysmacros.patch mode change 100644 => 100755 ports/core/tzdata/update mode change 100644 => 100755 rootfs/etc/issue mode change 100644 => 100755 rootfs/root/README rename toolchain/{11-m4 => 08-m4} (100%) delete mode 100755 toolchain/08-tcl delete mode 100755 toolchain/09-expect rename toolchain/{12-ncurses => 09-ncurses} (90%) rename toolchain/{13-bash => 10-bash} (99%) delete mode 100755 toolchain/10-dejagnu rename toolchain/{14-bison => 11-bison} (99%) rename toolchain/{15-bzip2 => 12-bzip2} (100%) rename toolchain/{16-coreutils => 13-coreutils} (100%) rename toolchain/{17-diffutils => 14-diffutils} (100%) rename toolchain/{18-file => 15-file} (100%) create mode 100755 toolchain/16-findutils rename toolchain/{20-gawk => 17-gawk} (100%) rename toolchain/{21-gettext => 18-gettext} (100%) delete mode 100755 toolchain/19-findutils rename toolchain/{22-grep => 19-grep} (100%) rename toolchain/{23-gzip => 20-gzip} (53%) rename toolchain/{24-make => 21-make} (99%) rename toolchain/{25-patch => 22-patch} (100%) rename toolchain/{26-perl => 23-perl} (100%) rename toolchain/{27-python => 24-python} (100%) rename toolchain/{28-sed => 25-sed} (100%) rename toolchain/{29-tar => 26-tar} (100%) rename toolchain/{30-texinfo => 27-texinfo} (100%) rename toolchain/{31-xz => 28-xz} (100%) rename toolchain/{32-openssl => 29-openssl} (100%) rename toolchain/{33-certs => 30-certs} (100%) rename toolchain/{34-curl => 31-curl} (100%) rename toolchain/{36-libarchive => 32-libarchive} (75%) rename toolchain/{41-pkgutils => 33-pkgutils} (91%) delete mode 100755 toolchain/35-zlib delete mode 100755 toolchain/37-attr delete mode 100755 toolchain/38-acl delete mode 100755 toolchain/39-expat delete mode 100755 toolchain/40-lz4 delete mode 100755 toolchain/42-wget diff --git a/02-base b/02-base index d97e47b..e165f4e 100755 --- a/02-base +++ b/02-base @@ -134,7 +134,7 @@ PKGS="filesystem linux-api-headers man-pages glibc tzdata zlib bzip2 file readli diffutils gawk findutils groff fuse2 grub less gzip iproute2 kbd libpipeline make patch man-db tar texinfo vim procps-ng util-linux e2fsprogs sysklogd sysvinit eudev lfs-bootscripts linux-firmware libarchive mkinitramfs linux libtasn1 p11-kit ca-certificates wget pkgutils libnl dbus libxml2 dhcpcd wpa_supplicant lzo lz4 squashfs-tools popt efivar pciutils efibootmgr libpng which freetype2 dosfstools grub-efi - curl ports httpup gpm libevent links" + curl ports httpup gpm libevent links mtools syslinux" if [ ! -f $LFS/var/lib/pkg/db ]; then lfs_dirs diff --git a/03-mkiso b/03-mkiso index 0d92faa..e3a426f 100755 --- a/03-mkiso +++ b/03-mkiso @@ -73,7 +73,7 @@ mkdir -p $WDIR printstep "Preparing isolinux files..." mkdir -p $WDIR/{lfs,isolinux,boot} for file in $isolinux_files; do - cp /usr/share/syslinux/$file $WDIR/isolinux + cp $LFS/usr/share/syslinux/$file $WDIR/isolinux || die "failed copying '$file'" done #cp isolinux/splash.png $WDIR/isolinux cp $FILEDIR/isolinux.cfg $WDIR/isolinux @@ -92,19 +92,19 @@ printstep "Preparing kernel and initramfs..." cp $LFS/boot/vmlinuz-lfs $WDIR/boot/vmlinuz || die "failed copying kernel" cp files/livecd.hook $LFS/etc/mkinitramfs.d kernver=$(file $LFS/boot/vmlinuz-lfs | cut -d ' ' -f9) -chroot_run mkinitramfs -k $kernver -a livecd -o /boot/initrd-lfs.img || die "failed create initramfs" -mv $LFS/boot/initrd-lfs.img $WDIR/boot/initrd || die "failed copying initrd" +chroot_run mkinitramfs -k $kernver -a livecd -o /boot/initrd-live.img || die "failed create initramfs" +mv $LFS/boot/initrd-live.img $WDIR/boot/initrd || die "failed copying initrd" printstep "Setup UEFI mode..." mkdir -p $WDIR/boot/{grub/{fonts,x86_64-efi},EFI} -if [ -f /usr/share/grub/unicode.pf2 ];then - cp /usr/share/grub/unicode.pf2 $WDIR/boot/grub/fonts +if [ -f $LFS/usr/share/grub/unicode.pf2 ];then + cp $LFS/usr/share/grub/unicode.pf2 $WDIR/boot/grub/fonts fi if [ -f $WDIR/isolinux/splash.png ]; then cp $WDIR/isolinux/splash.png $WDIR/boot/grub/ fi echo "set prefix=/boot/grub" > $WDIR/boot/grub-early.cfg -cp -a /usr/lib/grub/x86_64-efi/*.{mod,lst} $WDIR/boot/grub/x86_64-efi || die "Failed copying efi files" +cp -a $LFS/usr/lib/grub/x86_64-efi/*.{mod,lst} $WDIR/boot/grub/x86_64-efi || die "Failed copying efi files" cp $FILEDIR/grub.cfg $WDIR/boot/grub/ grub-mkimage -c $WDIR/boot/grub-early.cfg -o $WDIR/boot/EFI/bootx64.efi -O x86_64-efi -p "" iso9660 normal search search_fs_file diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/enter-chroot b/enter-chroot new file mode 100755 index 0000000..1477703 --- /dev/null +++ b/enter-chroot @@ -0,0 +1,97 @@ +#!/bin/sh +# +# script to enter chroot +# + +printhelp() { + cat << EOF + +Usage: + $(basename $0) [command] + +If 'command' is unspecified, ${0##*/} will launch /bin/sh. + +EOF +} + +msgerr() { + echo "ERROR: $*" +} + +unmount() { + while true; do + mountpoint -q $1 || break + umount $1 2>/dev/null + done +} + +[ "$(id -u)" = "0" ] || { + msgerr "$(basename $0) need root access!" + printhelp + exit 1 +} + +LFS="/mnt/lfs" + +if [ -f ./config ]; then + . ./config +fi + +[ -d "$LFS" ] || { + msgerr "Directory '$LFS' not exist!" + printhelp + exit 1 +} + +if [ ! "$1" ]; then + CMD="/bin/sh" +else + CMD=$* +fi + +if [ -e /sys/firmware/efi/systab ]; then + EFI_SYSTEM=1 +fi + +mount --bind /dev $LFS/dev +mount -t devpts devpts $LFS/dev/pts -o gid=5,mode=620 +mount -t proc proc $LFS/proc +mount -t sysfs sysfs $LFS/sys +if [ -n "$EFI_SYSTEM" ]; then + mount --bind /sys/firmware/efi/efivars $LFS/sys/firmware/efi/efivars +fi +mount -t tmpfs tmpfs $LFS/run + +if [ -h $LFS/dev/shm ]; then + mkdir -p $LFS/$(readlink $LFS/dev/shm) +fi + +[ -f $LFS/etc/resolv.conf ] && { + backupresolvconf=1 + mv $LFS/etc/resolv.conf $LFS/etc/resolv.conf.tmp +} +cp -L /etc/resolv.conf $LFS/etc + +chroot "$LFS" /usr/bin/env -i \ +HOME=/root \ +TERM="$TERM" \ +PS1='\u:\w\$ ' \ +PATH=/bin:/usr/bin:/sbin:/usr/sbin $CMD + +retval=$? + +[ "$backupresolvconf" = 1 ] && { + mv $LFS/etc/resolv.conf.tmp $LFS/etc/resolv.conf +} + +unmount $LFS/dev/pts +unmount $LFS/dev +unmount $LFS/run +unmount $LFS/proc +if [ -n "$EFI_SYSTEM" ]; then + unmount $LFS/sys/firmware/efi/efivars +fi +unmount $LFS/sys + +exit $retval + diff --git a/files/core.httpup b/files/core.httpup old mode 100644 new mode 100755 diff --git a/files/grub.cfg b/files/grub.cfg old mode 100644 new mode 100755 diff --git a/patches/lfs-bootscripts_add-support-uefi.patch b/patches/lfs-bootscripts_add-support-uefi.patch old mode 100644 new mode 100755 diff --git a/patches/pkgutils_fix-build-needed-trigger.patch b/patches/pkgutils_fix-build-needed-trigger.patch old mode 100644 new mode 100755 diff --git a/ports/core/.httpup-repgen-ignore b/ports/core/.httpup-repgen-ignore old mode 100644 new mode 100755 diff --git a/ports/core/REPO b/ports/core/REPO old mode 100644 new mode 100755 diff --git a/ports/core/dbus/update b/ports/core/dbus/update old mode 100644 new mode 100755 diff --git a/ports/core/efibootmgr/update b/ports/core/efibootmgr/update old mode 100644 new mode 100755 diff --git a/ports/core/efivar/0dad6d78a7fb5f6c5fb4a1d646040539db6cf865.patch b/ports/core/efivar/0dad6d78a7fb5f6c5fb4a1d646040539db6cf865.patch old mode 100644 new mode 100755 diff --git a/ports/core/efivar/b98ba8921010d03f46704a476c69861515deb1ca.patch b/ports/core/efivar/b98ba8921010d03f46704a476c69861515deb1ca.patch old mode 100644 new mode 100755 diff --git a/ports/core/efivar/c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch b/ports/core/efivar/c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch old mode 100644 new mode 100755 diff --git a/ports/core/filesystem/group b/ports/core/filesystem/group old mode 100644 new mode 100755 diff --git a/ports/core/filesystem/issue b/ports/core/filesystem/issue old mode 100644 new mode 100755 diff --git a/ports/core/filesystem/passwd b/ports/core/filesystem/passwd old mode 100644 new mode 100755 diff --git a/ports/core/flex/update b/ports/core/flex/update old mode 100644 new mode 100755 diff --git a/ports/core/fuse2/update b/ports/core/fuse2/update old mode 100644 new mode 100755 diff --git a/ports/core/gpm/update b/ports/core/gpm/update old mode 100644 new mode 100755 diff --git a/ports/core/less/update b/ports/core/less/update old mode 100644 new mode 100755 diff --git a/ports/core/lfs-bootscripts/lfs-bootscripts_add-support-uefi.patch b/ports/core/lfs-bootscripts/lfs-bootscripts_add-support-uefi.patch old mode 100644 new mode 100755 diff --git a/ports/core/libevent/update b/ports/core/libevent/update old mode 100644 new mode 100755 diff --git a/ports/core/libnl/update b/ports/core/libnl/update old mode 100644 new mode 100755 diff --git a/ports/core/linux-firmware/update b/ports/core/linux-firmware/update old mode 100644 new mode 100755 diff --git a/ports/core/linux/config b/ports/core/linux/config old mode 100644 new mode 100755 diff --git a/ports/core/linux/post-install b/ports/core/linux/post-install new file mode 100755 index 0000000..28ee594 --- /dev/null +++ b/ports/core/linux/post-install @@ -0,0 +1,11 @@ +#!/bin/sh + +if [ -f /lib/modules/KERNELVERSION ]; then + kver=$(cat /lib/modules/KERNELVERSION) +else + kver=$(file /boot/vmlinuz-lfs | cut -d ' ' -f9) +fi + +mkinitramfs -q -k $kver -o /boot/initrd-lfs.img +depmod $kver + diff --git a/ports/core/mtools/Pkgfile b/ports/core/mtools/Pkgfile new file mode 100755 index 0000000..8e8960b --- /dev/null +++ b/ports/core/mtools/Pkgfile @@ -0,0 +1,21 @@ +# Description: Utilities to access MS-DOS disks without mounting them +# URL: https://www.gnu.org/software/mtools/ +# Maintainer: Emmett1, emmett1 dot 2miligrams at gmail dot com + +name=mtools +version=4.0.24 +release=1 +source=(ftp://ftp.gnu.org/gnu/mtools/$name-$version.tar.bz2) + +build() { + cd $name-$version + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --disable-floppyd + make + sed -i Makefile -e 's|install-scripts install-info|install-scripts|' + make -j1 prefix=$PKG/usr install +} + diff --git a/ports/core/perl/update b/ports/core/perl/update old mode 100644 new mode 100755 diff --git a/ports/core/pkgutils/pkgmk.conf b/ports/core/pkgutils/pkgmk.conf index 2becd01..e1b0e0d 100755 --- a/ports/core/pkgutils/pkgmk.conf +++ b/ports/core/pkgutils/pkgmk.conf @@ -33,7 +33,7 @@ PKGMK_DOWNLOAD="yes" # PKGMK_IGNORE_FOOTPRINT="no" # PKGMK_IGNORE_NEW="no" # PKGMK_NO_STRIP="no" -# PKGMK_DOWNLOAD_PROG="wget" +PKGMK_DOWNLOAD_PROG="curl" # PKGMK_WGET_OPTS="" # PKGMK_CURL_OPTS="" PKGMK_COMPRESSION_MODE="xz" diff --git a/ports/core/pkgutils/pkgutils_fix-build-needed-trigger.patch b/ports/core/pkgutils/pkgutils_fix-build-needed-trigger.patch old mode 100644 new mode 100755 diff --git a/ports/core/ports/core.httpup b/ports/core/ports/core.httpup old mode 100644 new mode 100755 diff --git a/ports/core/python3/update b/ports/core/python3/update old mode 100644 new mode 100755 diff --git a/ports/core/syslinux/Pkgfile b/ports/core/syslinux/Pkgfile new file mode 100755 index 0000000..cc52d8a --- /dev/null +++ b/ports/core/syslinux/Pkgfile @@ -0,0 +1,19 @@ +# Description: Collection of boot loaders for the Linux operating system +# URL: +# Maintainer: Emmett1, emmett1 dot 2miligrams at gmail dot com +# Depends on: mtools + +name=syslinux +version=6.03 +release=1 +source=(http://www.kernel.org/pub/linux/utils/boot/$name/$name-$version.tar.xz + $name-$version-sysmacros.patch) + +build() { + cd $name-$version + + patch -p1 -i $SRC/$name-$version-sysmacros.patch + + make OPTFLAGS="$CFLAGS" installer + make OPTFLAGS="$CFLAGS" INSTALLROOT=$PKG MANDIR=/usr/share/man install +} diff --git a/ports/core/syslinux/syslinux-6.03-sysmacros.patch b/ports/core/syslinux/syslinux-6.03-sysmacros.patch new file mode 100755 index 0000000..af464fe --- /dev/null +++ b/ports/core/syslinux/syslinux-6.03-sysmacros.patch @@ -0,0 +1,34 @@ +https://bugs.gentoo.org/579928 + +From d84db34dbe39d55b4d7e868764c056689aa0793b Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Tue, 19 Apr 2016 01:56:41 -0400 +Subject: [PATCH] extlinux: pull in sys/sysmacros.h for major/minor/makedev + +These functions are defined in sys/sysmacros.h, so add the include to +main.c. This is already handled correctly in mountinfo.c. Otherwise +we get build failures like: + +main.o: In function 'find_device_sysfs': +extlinux/main.c:1131: undefined reference to 'minor' + +Signed-off-by: Mike Frysinger +--- + extlinux/main.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/extlinux/main.c b/extlinux/main.c +index a7ebd49..ebff7ea 100644 +--- a/extlinux/main.c ++++ b/extlinux/main.c +@@ -38,6 +38,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.7.4 + diff --git a/ports/core/tzdata/update b/ports/core/tzdata/update old mode 100644 new mode 100755 diff --git a/rootfs/etc/issue b/rootfs/etc/issue old mode 100644 new mode 100755 diff --git a/rootfs/root/README b/rootfs/root/README old mode 100644 new mode 100755 index be47d0c..24510e6 --- a/rootfs/root/README +++ b/rootfs/root/README @@ -1,5 +1,5 @@ - Linux From Scratch LiveCD (Unofficial - ===================================== + Linux From Scratch LiveCD (Unofficial) + ====================================== Project: https://github.com/emmett1/lfs-scripts Email : emmett1.2miligrams@gmail.com diff --git a/toolchain/03-linux-api-headers b/toolchain/03-linux-api-headers index 06c08ae..05346f4 100755 --- a/toolchain/03-linux-api-headers +++ b/toolchain/03-linux-api-headers @@ -5,6 +5,9 @@ source=(https://www.kernel.org/pub/linux/kernel/v5.x/linux-$version.tar.xz) build() { cd linux-$version make mrproper - make INSTALL_HDR_PATH=dest headers_install - cp -rv dest/include/* /tools/include + make headers + find usr/include -name '.*' -delete + rm usr/include/Makefile + mkdir -p /tools/include + cp -rv usr/include/* /tools/include } diff --git a/toolchain/11-m4 b/toolchain/08-m4 similarity index 100% rename from toolchain/11-m4 rename to toolchain/08-m4 diff --git a/toolchain/08-tcl b/toolchain/08-tcl deleted file mode 100755 index 79a80ed..0000000 --- a/toolchain/08-tcl +++ /dev/null @@ -1,15 +0,0 @@ -name=tcl -version=8.6.10 -source=(https://downloads.sourceforge.net/tcl/tcl$version-src.tar.gz) - -build() { - cd ${name}${version} - - cd unix - ./configure --prefix=/tools - make - make install - chmod -v u+w /tools/lib/libtcl8.6.so - make install-private-headers - ln -sv tclsh8.6 /tools/bin/tclsh -} diff --git a/toolchain/09-expect b/toolchain/09-expect deleted file mode 100755 index 132ab6e..0000000 --- a/toolchain/09-expect +++ /dev/null @@ -1,15 +0,0 @@ -name=expect -version=5.45.4 -source=(https://prdownloads.sourceforge.net/expect/expect$version.tar.gz) - -build() { - cd ${name}${version} - - cp -v configure{,.orig} - sed 's:/usr/local/bin:/bin:' configure.orig > configure - ./configure --prefix=/tools \ - --with-tcl=/tools/lib \ - --with-tclinclude=/tools/include - make - make SCRIPTS="" install -} diff --git a/toolchain/12-ncurses b/toolchain/09-ncurses similarity index 90% rename from toolchain/12-ncurses rename to toolchain/09-ncurses index da28741..3d1137e 100755 --- a/toolchain/12-ncurses +++ b/toolchain/09-ncurses @@ -7,7 +7,8 @@ build() { sed -i s/mawk// configure - ./configure --prefix=/tools \ + ./configure \ + --prefix=/tools \ --with-shared \ --without-debug \ --without-ada \ diff --git a/toolchain/13-bash b/toolchain/10-bash similarity index 99% rename from toolchain/13-bash rename to toolchain/10-bash index 2869e07..69fb776 100755 --- a/toolchain/13-bash +++ b/toolchain/10-bash @@ -4,7 +4,6 @@ source=(http://ftp.gnu.org/gnu/bash/bash-$version.tar.gz) build() { cd $name-$version - ./configure --prefix=/tools --without-bash-malloc make make install diff --git a/toolchain/10-dejagnu b/toolchain/10-dejagnu deleted file mode 100755 index ce3aeb4..0000000 --- a/toolchain/10-dejagnu +++ /dev/null @@ -1,9 +0,0 @@ -name=dejagnu -version=1.6.2 -source=(http://ftp.gnu.org/gnu/dejagnu/dejagnu-$version.tar.gz) - -build() { - cd $name-$version - ./configure --prefix=/tools - make install -} diff --git a/toolchain/14-bison b/toolchain/11-bison similarity index 99% rename from toolchain/14-bison rename to toolchain/11-bison index 1e1243c..9532fd7 100755 --- a/toolchain/14-bison +++ b/toolchain/11-bison @@ -4,7 +4,6 @@ source=(http://ftp.gnu.org/gnu/bison/bison-$version.tar.xz) build() { cd $name-$version - ./configure --prefix=/tools make make install diff --git a/toolchain/15-bzip2 b/toolchain/12-bzip2 similarity index 100% rename from toolchain/15-bzip2 rename to toolchain/12-bzip2 diff --git a/toolchain/16-coreutils b/toolchain/13-coreutils similarity index 100% rename from toolchain/16-coreutils rename to toolchain/13-coreutils diff --git a/toolchain/17-diffutils b/toolchain/14-diffutils similarity index 100% rename from toolchain/17-diffutils rename to toolchain/14-diffutils diff --git a/toolchain/18-file b/toolchain/15-file similarity index 100% rename from toolchain/18-file rename to toolchain/15-file diff --git a/toolchain/16-findutils b/toolchain/16-findutils new file mode 100755 index 0000000..9cca716 --- /dev/null +++ b/toolchain/16-findutils @@ -0,0 +1,10 @@ +name=findutils +version=4.7.0 +source=(http://ftp.gnu.org/gnu/findutils/findutils-$version.tar.xz) + +build() { + cd $name-$version + ./configure --prefix=/tools + make + make install +} diff --git a/toolchain/20-gawk b/toolchain/17-gawk similarity index 100% rename from toolchain/20-gawk rename to toolchain/17-gawk diff --git a/toolchain/21-gettext b/toolchain/18-gettext similarity index 100% rename from toolchain/21-gettext rename to toolchain/18-gettext diff --git a/toolchain/19-findutils b/toolchain/19-findutils deleted file mode 100755 index 2433b7a..0000000 --- a/toolchain/19-findutils +++ /dev/null @@ -1,16 +0,0 @@ -name=findutils -version=4.7.0 -source=(http://ftp.gnu.org/gnu/findutils/findutils-$version.tar.xz) - -build() { - cd $name-$version - - # fixes required by glibc-2.28 - #sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' gl/lib/*.c - #sed -i '/unistd/a #include ' gl/lib/mountlist.c - #echo "#define _IO_IN_BACKUP 0x100" >> gl/lib/stdio-impl.h - - ./configure --prefix=/tools - make - make install -} diff --git a/toolchain/22-grep b/toolchain/19-grep similarity index 100% rename from toolchain/22-grep rename to toolchain/19-grep diff --git a/toolchain/23-gzip b/toolchain/20-gzip similarity index 53% rename from toolchain/23-gzip rename to toolchain/20-gzip index b48b391..8bcb300 100755 --- a/toolchain/23-gzip +++ b/toolchain/20-gzip @@ -4,11 +4,6 @@ source=(http://ftp.gnu.org/gnu/gzip/gzip-$version.tar.xz) build() { cd $name-$version - - #fixes required by glibc-2.28 - #sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c - #echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h - ./configure --prefix=/tools make make install diff --git a/toolchain/24-make b/toolchain/21-make similarity index 99% rename from toolchain/24-make rename to toolchain/21-make index 5ef3edc..d8c4498 100755 --- a/toolchain/24-make +++ b/toolchain/21-make @@ -4,7 +4,6 @@ source=(http://ftp.gnu.org/gnu/make/make-$version.tar.gz) build() { cd $name-$version - ./configure --prefix=/tools --without-guile make make install diff --git a/toolchain/25-patch b/toolchain/22-patch similarity index 100% rename from toolchain/25-patch rename to toolchain/22-patch diff --git a/toolchain/26-perl b/toolchain/23-perl similarity index 100% rename from toolchain/26-perl rename to toolchain/23-perl diff --git a/toolchain/27-python b/toolchain/24-python similarity index 100% rename from toolchain/27-python rename to toolchain/24-python diff --git a/toolchain/28-sed b/toolchain/25-sed similarity index 100% rename from toolchain/28-sed rename to toolchain/25-sed diff --git a/toolchain/29-tar b/toolchain/26-tar similarity index 100% rename from toolchain/29-tar rename to toolchain/26-tar diff --git a/toolchain/30-texinfo b/toolchain/27-texinfo similarity index 100% rename from toolchain/30-texinfo rename to toolchain/27-texinfo diff --git a/toolchain/31-xz b/toolchain/28-xz similarity index 100% rename from toolchain/31-xz rename to toolchain/28-xz diff --git a/toolchain/32-openssl b/toolchain/29-openssl similarity index 100% rename from toolchain/32-openssl rename to toolchain/29-openssl diff --git a/toolchain/33-certs b/toolchain/30-certs similarity index 100% rename from toolchain/33-certs rename to toolchain/30-certs diff --git a/toolchain/34-curl b/toolchain/31-curl similarity index 100% rename from toolchain/34-curl rename to toolchain/31-curl diff --git a/toolchain/36-libarchive b/toolchain/32-libarchive similarity index 75% rename from toolchain/36-libarchive rename to toolchain/32-libarchive index b5facbd..1c5cef1 100755 --- a/toolchain/36-libarchive +++ b/toolchain/32-libarchive @@ -5,7 +5,7 @@ source=(https://github.com/libarchive/libarchive/releases/download/v$version/lib build() { cd $name-$version - ./configure --prefix=/tools --without-xml2 --disable-shared + ./configure --prefix=/tools --without-xml2 make make install } diff --git a/toolchain/41-pkgutils b/toolchain/33-pkgutils similarity index 91% rename from toolchain/41-pkgutils rename to toolchain/33-pkgutils index 520d0d5..11da3a5 100755 --- a/toolchain/41-pkgutils +++ b/toolchain/33-pkgutils @@ -10,6 +10,9 @@ build() { patch -Np1 -i $PATCHDIR/pkgutils_add-compress-infopages.patch patch -Np1 -i $PATCHDIR/pkgutils_fix-build-needed-trigger.patch + sed -i -e 's/ --static//' \ + -e 's/ -static//' Makefile + make BINDIR=/tools/bin MANDIR=/tools/man ETCDIR=/tools/etc install sed -i 's,/etc/pkgmk.conf,/tools/etc/pkgmk.conf,' /tools/bin/pkgmk @@ -32,6 +35,7 @@ PKGMK_SOURCE_DIR="/var/lib/pkg/src" PKGMK_PACKAGE_DIR="/var/lib/pkg/pkg" PKGMK_WORK_DIR="/var/lib/pkg/work/$name" PKGMK_DOWNLOAD="yes" +PKGMK_DOWNLOAD_PROG="curl" PKGMK_IGNORE_SIGNATURE="yes" PKGMK_COMPRESSION_MODE="xz" diff --git a/toolchain/35-zlib b/toolchain/35-zlib deleted file mode 100755 index c4a360e..0000000 --- a/toolchain/35-zlib +++ /dev/null @@ -1,10 +0,0 @@ -name=zlib -version=1.2.11 -source=(https://zlib.net/zlib-$version.tar.xz) - -build() { - cd $name-$version - ./configure --prefix=/tools - make - make install -} diff --git a/toolchain/37-attr b/toolchain/37-attr deleted file mode 100755 index f76586d..0000000 --- a/toolchain/37-attr +++ /dev/null @@ -1,10 +0,0 @@ -name=attr -version=2.4.48 -source=(http://download.savannah.gnu.org/releases/attr/attr-$version.tar.gz) - -build() { - cd $name-$version - ./configure --prefix=/tools - make - make install -} diff --git a/toolchain/38-acl b/toolchain/38-acl deleted file mode 100755 index a96a11e..0000000 --- a/toolchain/38-acl +++ /dev/null @@ -1,10 +0,0 @@ -name=acl -version=2.2.53 -source=(http://download.savannah.gnu.org/releases/acl/acl-$version.tar.gz) - -build() { - cd $name-$version - ./configure --prefix=/tools --disable-shared - make - make install -} diff --git a/toolchain/39-expat b/toolchain/39-expat deleted file mode 100755 index de5ebc8..0000000 --- a/toolchain/39-expat +++ /dev/null @@ -1,10 +0,0 @@ -name=expat -version=2.2.9 -source=(https://prdownloads.sourceforge.net/expat/expat-$version.tar.xz) - -build() { - cd $name-$version - ./configure --prefix=/tools - make - make install -} diff --git a/toolchain/40-lz4 b/toolchain/40-lz4 deleted file mode 100755 index 1e152e9..0000000 --- a/toolchain/40-lz4 +++ /dev/null @@ -1,9 +0,0 @@ -name=lz4 -version=1.9.2 -source=(https://github.com/lz4/lz4/archive/v$version.tar.gz) - -build() { - cd $name-$version - make PREFIX=/tools - make PREFIX=/tools install -} diff --git a/toolchain/42-wget b/toolchain/42-wget deleted file mode 100755 index 48934fd..0000000 --- a/toolchain/42-wget +++ /dev/null @@ -1,17 +0,0 @@ -name=wget -version=1.20.3 -source=(https://ftp.gnu.org/gnu/wget/wget-$version.tar.gz) - -build() { - cd $name-$version - ./configure --prefix=/tools \ - --with-ssl=openssl \ - --without-libidn \ - --without-libpsl \ - --without-metalink \ - --disable-pcre2 - make - make install - - echo "ca_certificate = /tools/etc/ssl/certs/ca-certificates.crt" > /tools/etc/wgetrc -}