From 2eec6103068f3dce5ea33e3e9e0821f2a4b4f6af Mon Sep 17 00:00:00 2001 From: davidovski Date: Sun, 30 Jan 2022 19:05:12 +0000 Subject: removed any unecessary curls from prepares --- repo/linux/linux.xibuild | 5 ++++- repo/system/binutils.xibuild | 5 ++++- repo/system/bzip2.xibuild | 6 ------ repo/system/efivar.xibuild | 7 +++++-- repo/system/glibc.xibuild | 2 -- repo/system/grub.xibuild | 8 ++++++-- repo/system/sysvinit.xibuild | 7 ++++++- repo/util/dosfstools.xibuild | 7 ------- repo/util/vim.xibuild | 7 +++---- 9 files changed, 28 insertions(+), 26 deletions(-) diff --git a/repo/linux/linux.xibuild b/repo/linux/linux.xibuild index 6b12a68..e69deb8 100644 --- a/repo/linux/linux.xibuild +++ b/repo/linux/linux.xibuild @@ -5,9 +5,12 @@ DEPS=() PKG_VER=5.15.14 SOURCE=https://cdn.kernel.org/pub/linux/kernel/v$(echo $PKG_VER | cut -d. -f1).x/linux-$PKG_VER.tar.xz +ADDITIONAL=( + https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/linux/trunk/config + ) prepare () { - curl https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/linux/trunk/config > .config + mv config .config make olddefconfig make -s kernelrelease > version diff --git a/repo/system/binutils.xibuild b/repo/system/binutils.xibuild index bea9c90..2a71ffe 100644 --- a/repo/system/binutils.xibuild +++ b/repo/system/binutils.xibuild @@ -5,10 +5,13 @@ DEPS=(glib zlib elfutils) PKG_VER=2.37 SOURCE=https://ftp.gnu.org/gnu/binutils/binutils-$PKG_VER.tar.xz +ADDITIONAL=( + https://www.linuxfromscratch.org/patches/lfs/development/binutils-$PKG_VER-upstream_fix-1.patch + ) + DESC="tools for handling object files" prepare () { - curl -sSL https://www.linuxfromscratch.org/patches/lfs/development/binutils-$PKG_VER-upstream_fix-1.patch > binutils-$PKG_VER-upstream_fix-1.patch /usr/bin/patch -Np1 -i binutils-$PKG_VER-upstream_fix-1.patch # An error in the building system causes the shipped man pages to be empty. Workaround the issue and remove the shipped man pages, so the man pages will be regenerated correctly: diff --git a/repo/system/bzip2.xibuild b/repo/system/bzip2.xibuild index 4e04af3..ff2f2d0 100644 --- a/repo/system/bzip2.xibuild +++ b/repo/system/bzip2.xibuild @@ -10,15 +10,9 @@ DESC="a selection of programs for compressing and decompressing bzip2 files" prepare () { - #curl https://www.linuxfromscratch.org/patches/lfs/development/bzip2-$PKG_VER-install_docs-1.patch > bzip2-$PKG_VER-install_docs-1.patch - - #patch -Np1 -i bzip2-$PKG_VER-install_docs-1.patch - # ensure symbolic links are relative sed -i 's@\(ln -s -f \)$(PREFIX)/bin/@\1@' Makefile - - #sed -i "s@(PREFIX)/man@(PREFIX)/share/man@g" Makefile } build () { diff --git a/repo/system/efivar.xibuild b/repo/system/efivar.xibuild index e01d66b..e4b38b2 100644 --- a/repo/system/efivar.xibuild +++ b/repo/system/efivar.xibuild @@ -5,11 +5,14 @@ DEPS=() PKG_VER=37 SOURCE=https://github.com/rhboot/efivar/releases/download/$PKG_VER/efivar-$PKG_VER.tar.bz2 +ADDITIONAL=( + https://www.linuxfromscratch.org/patches/blfs/svn/efivar-$PKG_VER-gcc_9-1.patch + ) + DESC="Tools and libraries to manupulate EFI variables" prepare () { - curl -SsL https://www.linuxfromscratch.org/patches/blfs/svn/efivar-$PKG_VER-gcc_9-1.patch > efivar-$PKG_VER.patch - patch -Np1 -i efivar-$PKG_VER.patch + patch -Np1 -i efivar-$PKG_VER-gcc_9.1.patch } build () { diff --git a/repo/system/glibc.xibuild b/repo/system/glibc.xibuild index c5cfd74..b9d6669 100644 --- a/repo/system/glibc.xibuild +++ b/repo/system/glibc.xibuild @@ -75,8 +75,6 @@ rpc: files # End /etc/nsswitch.conf EOF - - curl #install -m755 locale-gen "$PKG_DEST/usr/bin" #curl https://data.iana.org/time-zones/releases/tzdata2021e.tar.gz > tzdata2021e.tar.gz diff --git a/repo/system/grub.xibuild b/repo/system/grub.xibuild index 31eaff0..77647c9 100644 --- a/repo/system/grub.xibuild +++ b/repo/system/grub.xibuild @@ -5,11 +5,15 @@ DEPS=(sh xz gettext device-mapper efibootmgr freetype2) PKG_VER=2.06 SOURCE=https://ftp.gnu.org/gnu/grub/grub-$PKG_VER.tar.xz +ADDITIONAL=( + https://unifoundry.com/pub/unifont/unifont-13.0.06/font-builds/unifont-13.0.06.pcf.gz + ) + + DESC="GNU GRand Unified Bootloader v2" prepare () { - curl -SsL https://unifoundry.com/pub/unifont/unifont-13.0.06/font-builds/unifont-13.0.06.pcf.gz > unifont-13.0.06.pcf.gz - gunzip -c unifont-13.0.06.pcf.gz > /usr/share/fonts/unifont/unifont.pcf + gunzip -c unifont-13.0.06.pcf.gz > $PKG_DEST/usr/share/fonts/unifont/unifont.pcf unset {C,CPP,CXX,LD}FLAGS } diff --git a/repo/system/sysvinit.xibuild b/repo/system/sysvinit.xibuild index 63cd422..7d9add8 100644 --- a/repo/system/sysvinit.xibuild +++ b/repo/system/sysvinit.xibuild @@ -5,12 +5,17 @@ DEPS=(sh glibc) PKG_VER=3.01 SOURCE=http://download.savannah.nongnu.org/releases/sysvinit/sysvinit-$PKG_VER.tar.xz +ADDITIONAL=( + https://www.linuxfromscratch.org/patches/lfs/development/sysvinit-$PKG_VER-consolidated-1.patch + ) + DESC="The sysvinit system for controlling startup, running and shutdown of the system" + prepare () { - curl https://www.linuxfromscratch.org/patches/lfs/development/sysvinit-$PKG_VER-consolidated-1.patch > sysvinit-$PKG_VER-consolidated-1.patch patch -Np1 -i sysvinit-$PKG_VER-consolidated-1.patch } + build () { make } diff --git a/repo/util/dosfstools.xibuild b/repo/util/dosfstools.xibuild index 9c3a7ad..5564b4d 100644 --- a/repo/util/dosfstools.xibuild +++ b/repo/util/dosfstools.xibuild @@ -7,13 +7,6 @@ PKG_VER=4.2 SOURCE=https://github.com/dosfstools/dosfstools/releases/download/v$PKG_VER/dosfstools-$PKG_VER.tar.gz DESC="Utilities for use with the FAT familiy of file systems" -prepare () { - curl -SsL https://unifoundry.com/pub/unifont/unifont-13.0.06/font-builds/unifont-13.0.06.pcf.gz > unifont-13.0.06.pcf.gz - gunzip -c unifont-13.0.06.pcf.gz > /usr/share/fonts/unifont/unifont.pcf - - unset {C,CPP,CXX,LD}FLAGS -} - build () { ./configure --prefix=/usr \ --enable-compat-symlinks \ diff --git a/repo/util/vim.xibuild b/repo/util/vim.xibuild index 5bae024..e9a5336 100644 --- a/repo/util/vim.xibuild +++ b/repo/util/vim.xibuild @@ -20,7 +20,8 @@ build () { package () { make DESTDIR=$PKG_DEST install - cat > vimrc << "EOF" + mkdir -pv $PKG_DEST/etc + cat > $PKG_DEST/etc/vimrc << "EOF" " Begin /etc/vimrc " Ensure defaults are set before customizing settings, not after source $VIMRUNTIME/defaults.vim @@ -34,7 +35,5 @@ if (&term == "xterm") || (&term == "putty") endif " End /etc/vimrc EOF - curl -sL https://davidovski.xyz/r/vim/vimrc >> vimrc - mkdir -pv $PKG_DEST/etc - cp -v vimrc $PKG_DEST/etc/vimrc + } -- cgit v1.2.1