From fa4eff263b27739f8dd3ce57909817584ecb30bf Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sun, 12 Apr 2020 03:17:03 +0200 Subject: [PATCH] Cleanup: implement defaults for package functions This commit adds an "emptypackage" template that implements defaults for all package functions and is included before every package. Signed-off-by: David Oberhollenzer --- check_update.sh | 1 + pkg/basefiles/build | 8 -------- pkg/bash/build | 4 ---- pkg/bbstatic/build | 4 ---- pkg/btrfs-progs/build | 4 ---- pkg/bzip2/build | 8 -------- pkg/coreutils/build | 4 ---- pkg/dhcpcd/build | 4 ---- pkg/diffutils/build | 4 ---- pkg/dnsmasq/build | 4 ---- pkg/dosfstools/build | 4 ---- pkg/ethtool/build | 4 ---- pkg/expat/build | 4 ---- pkg/file/build | 4 ---- pkg/findutils/build | 4 ---- pkg/firmware-rpi/build | 8 -------- pkg/fortify-headers/build | 8 -------- pkg/gawk/build | 4 ---- pkg/gcron/build | 4 ---- pkg/gmp/build | 4 ---- pkg/grep/build | 4 ---- pkg/gzip/build | 4 ---- pkg/hostapd/build | 4 ---- pkg/iana-etc/build | 12 ------------ pkg/inetutils/build | 4 ---- pkg/init-scripts/build | 8 -------- pkg/init/build | 8 -------- pkg/initrd/build | 8 -------- pkg/iproute2/build | 4 ---- pkg/iw/build | 4 ---- pkg/kbd/build | 4 ---- pkg/kmod/build | 4 ---- pkg/ldns/build | 4 ---- pkg/less/build | 4 ---- pkg/libbsd/build | 4 ---- pkg/libmnl/build | 4 ---- pkg/libnftnl/build | 4 ---- pkg/libnl3/build | 4 ---- pkg/libpcap/build | 4 ---- pkg/libseccomp/build | 4 ---- pkg/linux-firmware-rpi3/build | 8 -------- pkg/linux-lts/build | 4 ---- pkg/lzo/build | 4 ---- pkg/musl/build | 4 ---- pkg/nano/build | 4 ---- pkg/ncurses/build | 4 ---- pkg/nftables/build | 4 ---- pkg/nginx/build | 4 ---- pkg/ntp/build | 4 ---- pkg/openssh/build | 4 ---- pkg/openssl/build | 4 ---- pkg/pcre/build | 4 ---- pkg/pcre2/build | 4 ---- pkg/procps-ng/build | 4 ---- pkg/psmisc/build | 4 ---- pkg/readline/build | 4 ---- pkg/release-alix/build | 4 ---- pkg/release-qemu/build | 5 ----- pkg/release-rpi3/build | 4 ---- pkg/rootfs/build | 8 -------- pkg/rpi-vc/build | 8 -------- pkg/sed/build | 4 ---- pkg/sqlite3/build | 4 ---- pkg/tar/build | 4 ---- pkg/tc-binutils/build | 4 ---- pkg/tc-file/build | 4 ---- pkg/tc-pkgtool/build | 8 -------- pkg/tc-squashfs/build | 4 ---- pkg/tcpdump/build | 4 ---- pkg/toolchain/build | 8 -------- pkg/unbound/build | 4 ---- pkg/usyslog/build | 8 -------- pkg/util-linux/build | 4 ---- pkg/xz/build | 4 ---- pkg/zlib/build | 4 ---- util/emptypkg.sh | 15 +++++++++++++++ util/pkgcmd.sh | 1 + 77 files changed, 17 insertions(+), 357 deletions(-) create mode 100644 util/emptypkg.sh diff --git a/check_update.sh b/check_update.sh index d75bed2..7782545 100755 --- a/check_update.sh +++ b/check_update.sh @@ -18,6 +18,7 @@ for pkg in $SCRIPTDIR/pkg/*; do name=$(basename $pkg) echo "-- checking $name" + source "$SCRIPTDIR/util/emptypkg.sh" source "$pkg/build" version=$(check_update) diff --git a/pkg/basefiles/build b/pkg/basefiles/build index 2b36e7d..b76ccc8 100644 --- a/pkg/basefiles/build +++ b/pkg/basefiles/build @@ -1,7 +1,3 @@ -build() { - return -} - deploy() { cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR" cp -r "$SCRIPTDIR/pkg/$PKGNAME/etc" "$PKGDEPLOYDIR" @@ -21,7 +17,3 @@ deploy() { >> "$PKGDEPLOYDIR/${PKGNAME}.files" fi } - -check_update() { - return -} diff --git a/pkg/bash/build b/pkg/bash/build index 98c0d14..f170b1a 100755 --- a/pkg/bash/build +++ b/pkg/bash/build @@ -6,10 +6,6 @@ SHA256SUM="b4a80f2ac66170b2913efbfb9f2594f1f76c7b1afd11f799e22035d63077fb4d" DEPENDS="ncurses-dev readline-dev toolchain" SUBPKG="bash bash-dev" -prepare() { - apply_patches -} - build() { run_configure "$1" --without-bash-malloc --with-installed-readline diff --git a/pkg/bbstatic/build b/pkg/bbstatic/build index 5575539..5b18bd2 100755 --- a/pkg/bbstatic/build +++ b/pkg/bbstatic/build @@ -5,10 +5,6 @@ URL="https://busybox.net/downloads" SHA256SUM="d0f940a72f648943c1f2211e0e3117387c31d765137d92bd8284a3fb9752a998" DEPENDS="toolchain" -prepare() { - apply_patches -} - build() { cp "$SCRIPTDIR/pkg/$PKGNAME/bbstatic.config" "$PKGBUILDDIR/.config" diff --git a/pkg/btrfs-progs/build b/pkg/btrfs-progs/build index ca88d1a..4c0cca7 100755 --- a/pkg/btrfs-progs/build +++ b/pkg/btrfs-progs/build @@ -6,10 +6,6 @@ SHA256SUM="890f8b7e162f2bbfaa5c7b23e8b6f791fd3f325239a0510871fa4b45e4a80e7c" DEPENDS="libuuid-dev libblkid-dev zlib-dev lzo-dev toolchain" SUBPKG="btrfs-progs-dev btrfs-progs" -prepare() { - return -} - build() { cp -r ${1}/* ${PKGBUILDDIR} diff --git a/pkg/bzip2/build b/pkg/bzip2/build index 88cf0c9..62f1d8b 100755 --- a/pkg/bzip2/build +++ b/pkg/bzip2/build @@ -6,10 +6,6 @@ SHA256SUM="d70a9ccd8bdf47e302d96c69fecd54925f45d9c7b966bb4ef5f56b770960afa7" DEPENDS="toolchain" SUBPKG="bzip2-dev bzip2" -prepare() { - return -} - build() { cp -r ${1}/* ${PKGBUILDDIR} @@ -30,7 +26,3 @@ deploy() { make PREFIX="$PKGDEPLOYDIR" install cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR" } - -check_update() { - return -} diff --git a/pkg/coreutils/build b/pkg/coreutils/build index 6f8bd82..bc1c4f1 100755 --- a/pkg/coreutils/build +++ b/pkg/coreutils/build @@ -5,10 +5,6 @@ URL="https://ftp.gnu.org/gnu/coreutils/" SHA256SUM="4458d8de7849df44ccab15e16b1548b285224dbba5f08fac070c1c0e0bcc4cfa" DEPENDS="toolchain" -prepare() { - apply_patches -} - build() { run_configure "$1" --enable-single-binary=symlinks make -j $NUMJOBS diff --git a/pkg/dhcpcd/build b/pkg/dhcpcd/build index bc09ca4..c8fffa4 100755 --- a/pkg/dhcpcd/build +++ b/pkg/dhcpcd/build @@ -5,10 +5,6 @@ URL="https://roy.marples.name/downloads/dhcpcd" SHA256SUM="6c2934a3e1e67a5cfd5bb15b1efa71f65c00314ac1ccb5c50da8eae3a0b8147f" DEPENDS="toolchain" -prepare() { - return -} - build() { local SOURCE="$1" diff --git a/pkg/diffutils/build b/pkg/diffutils/build index dab6799..422d2fa 100755 --- a/pkg/diffutils/build +++ b/pkg/diffutils/build @@ -5,10 +5,6 @@ URL="https://ftp.gnu.org/gnu/diffutils/" SHA256SUM="b3a7a6221c3dc916085f0d205abf6b8e1ba443d4dd965118da364a1dc1cb3a26" DEPENDS="toolchain" -prepare() { - return -} - build() { run_configure "$1" make -j $NUMJOBS diff --git a/pkg/dnsmasq/build b/pkg/dnsmasq/build index 7894be8..05d8ff9 100644 --- a/pkg/dnsmasq/build +++ b/pkg/dnsmasq/build @@ -5,10 +5,6 @@ URL="http://www.thekelleys.org.uk/dnsmasq" SHA256SUM="cdaba2785e92665cf090646cba6f94812760b9d7d8c8d0cfb07ac819377a63bb" DEPENDS="toolchain" -prepare() { - return -} - build() { cp -r ${1}/* ${PKGBUILDDIR} diff --git a/pkg/dosfstools/build b/pkg/dosfstools/build index 218f623..8a34cd1 100755 --- a/pkg/dosfstools/build +++ b/pkg/dosfstools/build @@ -5,10 +5,6 @@ URL="https://github.com/dosfstools/dosfstools/releases/download/v${VERSION}" SHA256SUM="e6b2aca70ccc3fe3687365009dd94a2e18e82b688ed4e260e04b7412471cc173" DEPENDS="toolchain" -prepare() { - return -} - build() { run_configure "$1" --disable-compat-symlinks --without-udev make -j $NUMJOBS diff --git a/pkg/ethtool/build b/pkg/ethtool/build index e604d9e..0ee3d26 100755 --- a/pkg/ethtool/build +++ b/pkg/ethtool/build @@ -5,10 +5,6 @@ URL="https://www.kernel.org/pub/software/network/ethtool/" SHA256SUM="22f81e4927d6eb6a13a259d705248a96005fce2005e15257f639f5a1c8c52b6b" DEPENDS="toolchain" -prepare() { - return -} - build() { run_configure "$1" make -j $NUMJOBS diff --git a/pkg/expat/build b/pkg/expat/build index 2f694f0..d796c37 100644 --- a/pkg/expat/build +++ b/pkg/expat/build @@ -6,10 +6,6 @@ SHA256SUM="1ea6965b15c2106b6bbe883397271c80dfa0331cdf821b2c319591b55eadc0a4" DEPENDS="libbsd-dev toolchain" SUBPKG="expat expat-dev" -prepare() { - return -} - build() { run_configure "$1" --without-xmlwf --with-libbsd make -j $NUMJOBS diff --git a/pkg/file/build b/pkg/file/build index c314058..bbbd4e7 100755 --- a/pkg/file/build +++ b/pkg/file/build @@ -6,10 +6,6 @@ SHA256SUM="593c2ffc2ab349c5aea0f55fedfe4d681737b6b62376a9b3ad1e77b2cc19fa34" DEPENDS="zlib-dev toolchain" SUBPKG="file file-dev" -prepare() { - return -} - build() { run_configure "$1" make -j $NUMJOBS diff --git a/pkg/findutils/build b/pkg/findutils/build index 54560d1..661589b 100755 --- a/pkg/findutils/build +++ b/pkg/findutils/build @@ -5,10 +5,6 @@ URL="https://ftp.gnu.org/gnu/findutils/" SHA256SUM="c5fefbdf9858f7e4feb86f036e1247a54c79fc2d8e4b7064d5aaa1f47dfa789a" DEPENDS="toolchain" -prepare() { - return -} - build() { run_configure "$1" --localstatedir=/var/lib/locate make -j $NUMJOBS diff --git a/pkg/firmware-rpi/build b/pkg/firmware-rpi/build index b3261ef..2715a0a 100755 --- a/pkg/firmware-rpi/build +++ b/pkg/firmware-rpi/build @@ -6,14 +6,6 @@ SHA256SUM="7ff2cfb5ea19fbd1d770ebbbcdab791830ebbc6fd36b6da1dee9edf4088f69d6" DEPENDS="toolchain" SUBPKG="boot-rpi boot-rpi-dtbo boot-rpi-dtb" -prepare() { - return -} - -build() { - return -} - deploy() { local SOURCE="$1" diff --git a/pkg/fortify-headers/build b/pkg/fortify-headers/build index 05da128..89355b0 100755 --- a/pkg/fortify-headers/build +++ b/pkg/fortify-headers/build @@ -5,14 +5,6 @@ URL="http://infraroot.at/pygos" SHA256SUM="4b6118e4fc8ad87bc0c05d5a4c11b9a4e04fb06d6951d6f21d033458cdb7bdbb" DEPENDS="linux-dev" -prepare() { - return -} - -build() { - return -} - deploy() { make -C "$1" PREFIX="" DESTDIR="$PKGDEPLOYDIR" install cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR" diff --git a/pkg/gawk/build b/pkg/gawk/build index 48e12bc..5d3abb0 100755 --- a/pkg/gawk/build +++ b/pkg/gawk/build @@ -6,10 +6,6 @@ SHA256SUM="8e4e86f04ed789648b66f757329743a0d6dfb5294c3b91b756a474f1ce05a794" DEPENDS="toolchain" SUBPKG="gawk gawk-dev" -prepare() { - return -} - build() { run_configure "$1" make -j $NUMJOBS diff --git a/pkg/gcron/build b/pkg/gcron/build index 0b747e8..cea815d 100755 --- a/pkg/gcron/build +++ b/pkg/gcron/build @@ -5,10 +5,6 @@ URL="http://infraroot.at/pygos" SHA256SUM="c3a184b2bbc64b187797c335256d277cd8c0a871e09eef5d90161c4ad8267714" DEPENDS="toolchain" -prepare() { - return -} - build() { run_configure "$1" make -j $NUMJOBS diff --git a/pkg/gmp/build b/pkg/gmp/build index 7807ac3..b7df72b 100755 --- a/pkg/gmp/build +++ b/pkg/gmp/build @@ -6,10 +6,6 @@ SHA256SUM="f51c99cb114deb21a60075ffb494c1a210eb9d7cb729ed042ddb7de9534451ea" DEPENDS="toolchain" SUBPKG="gmp gmp-dev gmp++ gmp++-dev" -prepare() { - return -} - build() { run_configure "$1" --enable-cxx make -j $NUMJOBS diff --git a/pkg/grep/build b/pkg/grep/build index 8245d94..88daf3b 100755 --- a/pkg/grep/build +++ b/pkg/grep/build @@ -5,10 +5,6 @@ URL="https://ftp.gnu.org/gnu/grep/" SHA256SUM="58e6751c41a7c25bfc6e9363a41786cff3ba5709cf11d5ad903cf7cce31cc3fb" DEPENDS="toolchain" -prepare() { - return -} - build() { run_configure "$1" make -j $NUMJOBS diff --git a/pkg/gzip/build b/pkg/gzip/build index 0013009..94f0ecd 100755 --- a/pkg/gzip/build +++ b/pkg/gzip/build @@ -5,10 +5,6 @@ URL="https://ftp.gnu.org/gnu/gzip/" SHA256SUM="8425ccac99872d544d4310305f915f5ea81e04d0f437ef1a230dc9d1c819d7c0" DEPENDS="toolchain" -prepare() { - return -} - build() { run_configure "$1" --with-regex=regcmp make -j $NUMJOBS diff --git a/pkg/hostapd/build b/pkg/hostapd/build index 29433f5..f791528 100755 --- a/pkg/hostapd/build +++ b/pkg/hostapd/build @@ -5,10 +5,6 @@ URL="https://w1.fi/releases" SHA256SUM="881d7d6a90b2428479288d64233151448f8990ab4958e0ecaca7eeb3c9db2bd7" DEPENDS="libnl3-dev openssl-dev toolchain" -prepare() { - return -} - build() { cp -r ${1}/* ${PKGBUILDDIR} cp "$SCRIPTDIR/pkg/$PKGNAME/config" "$PKGBUILDDIR/hostapd/.config" diff --git a/pkg/iana-etc/build b/pkg/iana-etc/build index 5e03eb6..34967e7 100755 --- a/pkg/iana-etc/build +++ b/pkg/iana-etc/build @@ -5,14 +5,6 @@ URL="http://infraroot.at/pygos" SHA256SUM="1d38d5d90fa04e6f2cca46aad575d1b1c63d9443150abf66fe4dfaf0409358c2" DEPENDS="toolchain" -prepare() { - return -} - -build() { - return -} - deploy() { local SOURCE="$1" @@ -21,7 +13,3 @@ deploy() { cp "$SOURCE/services" "$PKGDEPLOYDIR/etc" cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR" } - -check_update() { - return -} diff --git a/pkg/inetutils/build b/pkg/inetutils/build index 527915a..af4df38 100755 --- a/pkg/inetutils/build +++ b/pkg/inetutils/build @@ -5,10 +5,6 @@ URL="https://ftp.gnu.org/gnu/inetutils/" SHA256SUM="849d96f136effdef69548a940e3e0ec0624fc0c81265296987986a0dd36ded37" DEPENDS="ncurses-dev readline-dev toolchain" -prepare() { - return -} - build() { run_configure "$1" --disable-servers --disable-dnsdomainname \ --disable-rcp --disable-rexec --enable-hostname \ diff --git a/pkg/init-scripts/build b/pkg/init-scripts/build index 64db7ea..621a7d1 100755 --- a/pkg/init-scripts/build +++ b/pkg/init-scripts/build @@ -5,10 +5,6 @@ URL="http://infraroot.at/pygos" SHA256SUM="dbfc67b01376d6607c69bc845c31e2f792f20773c829973ae6bfb57ac30699ae" DEPENDS="toolchain" -prepare() { - return -} - build() { local extra_flags="" @@ -115,7 +111,3 @@ deploy() { unset -v i GETTY_TTY HWCLOCK DHCP_PORTS SERVICES MODULES } - -check_update() { - return -} diff --git a/pkg/init/build b/pkg/init/build index 859f982..08649b1 100755 --- a/pkg/init/build +++ b/pkg/init/build @@ -5,10 +5,6 @@ URL="http://infraroot.at/pygos" SHA256SUM="93c4368d182b41acbe5173a5094579760bf0d050f15e36fd06c6f762694fc241" DEPENDS="toolchain" -prepare() { - return -} - build() { run_configure "$1" make -j $NUMJOBS @@ -18,7 +14,3 @@ deploy() { make DESTDIR="$PKGDEPLOYDIR" install cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR" } - -check_update() { - return -} diff --git a/pkg/initrd/build b/pkg/initrd/build index 2ce48db..cbe111b 100755 --- a/pkg/initrd/build +++ b/pkg/initrd/build @@ -1,9 +1,5 @@ DEPENDS="bbstatic" -build() { - return -} - deploy() { cp $SCRIPTDIR/pkg/initrd/*.{desc,files} "$PKGDEPLOYDIR" @@ -13,7 +9,3 @@ deploy() { echo "file init 0755 0 0 $SCRIPTDIR/pkg/$PKGNAME/initrd.skel" \ >> "$PKGDEPLOYDIR/initrd.files" } - -check_update() { - return -} diff --git a/pkg/iproute2/build b/pkg/iproute2/build index b0b33c1..fd9718b 100755 --- a/pkg/iproute2/build +++ b/pkg/iproute2/build @@ -6,10 +6,6 @@ SHA256SUM="a5b95dec26353fc71dba9bb403e9343fad2a06bd69fb154a22a2aa2914f74da8" DEPENDS="toolchain libmnl-dev" SUBPKG="iproute2 iproute2-dev" -prepare() { - return -} - build() { cp -r ${1}/* ${PKGBUILDDIR} diff --git a/pkg/iw/build b/pkg/iw/build index 81b4df2..5271cc0 100755 --- a/pkg/iw/build +++ b/pkg/iw/build @@ -5,10 +5,6 @@ URL="https://mirrors.edge.kernel.org/pub/software/network/iw" SHA256SUM="04afe857bc8dea67e461946de30ae1b012954b6965839c5c3fda7d0ed15505d5" DEPENDS="libnl3-dev toolchain" -prepare() { - return -} - build() { cp -r ${1}/* ${PKGBUILDDIR} diff --git a/pkg/kbd/build b/pkg/kbd/build index 99d41b1..f8b9421 100755 --- a/pkg/kbd/build +++ b/pkg/kbd/build @@ -7,10 +7,6 @@ DEPENDS="toolchain" SUBPKG="consolefonts kbd kbd-unicode keymaps-amiga keymaps-atari keymaps-mac" SUBPKG="$SUBPKG keymaps-misc keymaps-pc keymaps-sun libkbd libkbd-dev" -prepare() { - return -} - build() { run_configure "$1" --enable-optional-progs --disable-tests \ --enable-libkeymap --disable-vlock diff --git a/pkg/kmod/build b/pkg/kmod/build index 7b6eccc..13fa704 100644 --- a/pkg/kmod/build +++ b/pkg/kmod/build @@ -6,10 +6,6 @@ SHA256SUM="c1d3fbf16ca24b95f334c1de1b46f17bbe5a10b0e81e72668bdc922ebffbbc0c" DEPENDS="zlib-dev xz-dev toolchain" SUBPKG="kmod kmod-dev" -prepare() { - return -} - build() { run_configure "$1" --with-xz --with-zlib make -j $NUMJOBS diff --git a/pkg/ldns/build b/pkg/ldns/build index 740f536..3da66fb 100755 --- a/pkg/ldns/build +++ b/pkg/ldns/build @@ -6,10 +6,6 @@ SHA256SUM="c19f5b1b4fb374cfe34f4845ea11b1e0551ddc67803bd6ddd5d2a20f0997a6cc" DEPENDS="openssl-dev toolchain" SUBPKG="ldns ldns-dev" -prepare() { - return -} - build() { run_configure "$1" --with-drill --without-pyldns --without-pyldnsx \ --without-p5-dns-ldns --with-ssl="$SYSROOT" diff --git a/pkg/less/build b/pkg/less/build index d6c2613..0deb6de 100755 --- a/pkg/less/build +++ b/pkg/less/build @@ -5,10 +5,6 @@ URL="https://ftp.gnu.org/gnu/less/" SHA256SUM="503f91ab0af4846f34f0444ab71c4b286123f0044a4964f1ae781486c617f2e2" DEPENDS="ncurses-dev toolchain" -prepare() { - return -} - build() { run_configure "$1" --with-regex=regcmp make -j $NUMJOBS diff --git a/pkg/libbsd/build b/pkg/libbsd/build index a2ec042..b8efe47 100644 --- a/pkg/libbsd/build +++ b/pkg/libbsd/build @@ -6,10 +6,6 @@ SHA256SUM="34b8adc726883d0e85b3118fa13605e179a62b31ba51f676136ecb2d0bc1a887" DEPENDS="toolchain" SUBPKG="libbsd libbsd-dev" -prepare() { - return -} - build() { run_configure "$1" make -j $NUMJOBS diff --git a/pkg/libmnl/build b/pkg/libmnl/build index 09fa41e..c308a60 100644 --- a/pkg/libmnl/build +++ b/pkg/libmnl/build @@ -6,10 +6,6 @@ SHA256SUM="171f89699f286a5854b72b91d06e8f8e3683064c5901fb09d954a9ab6f551f81" DEPENDS="toolchain" SUBPKG="libmnl libmnl-dev" -prepare() { - return -} - build() { run_configure "$1" make -j $NUMJOBS diff --git a/pkg/libnftnl/build b/pkg/libnftnl/build index 338cda7..c4188bf 100644 --- a/pkg/libnftnl/build +++ b/pkg/libnftnl/build @@ -6,10 +6,6 @@ SHA256SUM="66de4d05227c0a1a731c369b193010d18a05b1185c2735211e0ecf658eeb14f3" DEPENDS="libmnl-dev toolchain" SUBPKG="libnftnl libnftnl-dev" -prepare() { - return -} - build() { run_configure "$1" make -j $NUMJOBS diff --git a/pkg/libnl3/build b/pkg/libnl3/build index 3d1a223..11cb6bd 100644 --- a/pkg/libnl3/build +++ b/pkg/libnl3/build @@ -6,10 +6,6 @@ SHA256SUM="8beb7590674957b931de6b7f81c530b85dc7c1ad8fbda015398bc1e8d1ce8ec5" DEPENDS="toolchain" SUBPKG="libnl3 libnl3-dev" -prepare() { - return -} - build() { run_configure "$1" --disable-cli make -j $NUMJOBS diff --git a/pkg/libpcap/build b/pkg/libpcap/build index 2d69ae3..fdea47e 100755 --- a/pkg/libpcap/build +++ b/pkg/libpcap/build @@ -6,10 +6,6 @@ SHA256SUM="635237637c5b619bcceba91900666b64d56ecb7be63f298f601ec786ce087094" DEPENDS="libnl3-dev toolchain" SUBPKG="libpcap libpcap-dev" -prepare() { - apply_patches -} - build() { cp -r ${1}/* ${PKGBUILDDIR} sed -i "s#/usr/include/libnl3#$SYSROOT/include/libnl3#g" configure diff --git a/pkg/libseccomp/build b/pkg/libseccomp/build index 0b5fbfa..4f31dc3 100644 --- a/pkg/libseccomp/build +++ b/pkg/libseccomp/build @@ -5,10 +5,6 @@ URL="https://github.com/seccomp/libseccomp/releases/download/v${VERSION}" SHA256SUM="1ca3735249af66a1b2f762fe6e710fcc294ad7185f1cc961e5bd83f9988006e8" DEPENDS="toolchain" -prepare() { - return -} - build() { run_configure "$1" make -j $NUMJOBS diff --git a/pkg/linux-firmware-rpi3/build b/pkg/linux-firmware-rpi3/build index c973053..cadea33 100755 --- a/pkg/linux-firmware-rpi3/build +++ b/pkg/linux-firmware-rpi3/build @@ -5,10 +5,6 @@ URL="http://infraroot.at/pygos" SHA256SUM="66e5bc59017f1df8b0e25dd49d4df91fd8f841954f9bc1efc2b88095fdf75e12" DEPENDS="toolchain" -prepare() { - return -} - build() { cp -r $1/* "$PKGBUILDDIR" } @@ -17,7 +13,3 @@ deploy() { make DESTDIR="$PKGDEPLOYDIR" install cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR" } - -check_update() { - return -} diff --git a/pkg/linux-lts/build b/pkg/linux-lts/build index 2919de3..9db9f37 100755 --- a/pkg/linux-lts/build +++ b/pkg/linux-lts/build @@ -24,10 +24,6 @@ get_linux_cpu() { esac } -prepare() { - return -} - build() { local INITRDDIR="$PKGDEPLOYDIR/initrd" local INITRDLIST="$INITRDDIR/initrd.list" diff --git a/pkg/lzo/build b/pkg/lzo/build index f62e03d..0469ec2 100644 --- a/pkg/lzo/build +++ b/pkg/lzo/build @@ -6,10 +6,6 @@ SHA256SUM="c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072" DEPENDS="toolchain" SUBPKG="lzo lzo-dev" -prepare() { - return -} - build() { run_configure "$1" make -j $NUMJOBS diff --git a/pkg/musl/build b/pkg/musl/build index 2668897..19de955 100755 --- a/pkg/musl/build +++ b/pkg/musl/build @@ -6,10 +6,6 @@ SHA256SUM="c6de7b191139142d3f9a7b5b702c9cae1b5ee6e7f57e582da9328629408fd4e8" DEPENDS="tc-gcc1 linux-dev fortify-headers tc-pkgtool" SUBPKG="libc libc-dev" -prepare() { - return -} - build() { local cflags="-O2 -Os" local ldflags="" diff --git a/pkg/nano/build b/pkg/nano/build index bb6de49..65a41e8 100644 --- a/pkg/nano/build +++ b/pkg/nano/build @@ -5,10 +5,6 @@ URL="https://ftp.gnu.org/gnu/nano" SHA256SUM="c348f61c68ab1d573b308398212a09cd68c60fbee20f01a5bd4b50071a258e63" DEPENDS="ncurses-dev toolchain" -prepare() { - return -} - build() { run_configure "$1" --enable-utf8 make -j $NUMJOBS diff --git a/pkg/ncurses/build b/pkg/ncurses/build index 6f996b3..d657ad0 100755 --- a/pkg/ncurses/build +++ b/pkg/ncurses/build @@ -6,10 +6,6 @@ SHA256SUM="30306e0c76e0f9f1f0de987cf1c82a5c21e1ce6568b9227f7da5b71cbea86c9d" DEPENDS="toolchain toolchain" SUBPKG="ncurses-dev ncurses++-dev ncurses" -prepare() { - apply_patches -} - build() { run_configure "$1" --with-shared --without-debug --without-ada \ --enable-widec --with-pkg-config-libdir=/lib/pkgconfig \ diff --git a/pkg/nftables/build b/pkg/nftables/build index edbe25f..3da63e0 100644 --- a/pkg/nftables/build +++ b/pkg/nftables/build @@ -6,10 +6,6 @@ SHA256SUM="956b915ce2a7aeaff123e49006be7a0690a0964e96c062703181a36e2e5edb78" DEPENDS="libmnl-dev libnftnl-dev gmp-dev readline-dev ncurses-dev toolchain" SUBPKG="nftables nftables-dev" -prepare() { - return -} - build() { run_configure "$1" --disable-debug --disable-man-doc --without-mini-gmp make -j $NUMJOBS diff --git a/pkg/nginx/build b/pkg/nginx/build index 439d775..e0f55d6 100755 --- a/pkg/nginx/build +++ b/pkg/nginx/build @@ -5,10 +5,6 @@ URL="https://nginx.org/download" SHA256SUM="7dd65d405c753c41b7fdab9415cfb4bdbaf093ec6d9f7432072d52cb7bcbb689" DEPENDS="zlib-dev openssl-dev pcre-dev toolchain" -prepare() { - apply_patches -} - build() { cp -r ${1}/* ${PKGBUILDDIR} diff --git a/pkg/ntp/build b/pkg/ntp/build index ac4f13e..339b52b 100644 --- a/pkg/ntp/build +++ b/pkg/ntp/build @@ -5,10 +5,6 @@ URL="https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2" SHA256SUM="1960e4f081f6aafd108d721bc3ab15f9e8dfd08dc08339aa95bca9d2545e4eb7" DEPENDS="openssl-dev zlib-dev readline-dev toolchain" -prepare() { - return -} - build() { CFLAGS=-fno-stack-protector \ run_configure "$1" --with-openssl-libdir="$SYSROOT/lib" \ diff --git a/pkg/openssh/build b/pkg/openssh/build index b00907f..c81dc2b 100644 --- a/pkg/openssh/build +++ b/pkg/openssh/build @@ -5,10 +5,6 @@ URL="https://cloudflare.cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable" SHA256SUM="43925151e6cf6cee1450190c0e9af4dc36b41c12737619edff8bcebdff64e671" DEPENDS="openssl-dev zlib-dev toolchain" -prepare() { - return -} - build() { run_configure "$1" --with-pie --without-pam --without-stackprotect \ --without-selinux --disable-strip \ diff --git a/pkg/openssl/build b/pkg/openssl/build index e55e389..9a1758e 100755 --- a/pkg/openssl/build +++ b/pkg/openssl/build @@ -6,10 +6,6 @@ SHA256SUM="186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35" DEPENDS="zlib-dev toolchain" SUBPKG="openssl openssl-dev" -prepare() { - return -} - build() { local OPENSSL_TARGET="" local cflags="-O2 -Os" diff --git a/pkg/pcre/build b/pkg/pcre/build index e043ca5..0eb5e82 100755 --- a/pkg/pcre/build +++ b/pkg/pcre/build @@ -6,10 +6,6 @@ SHA256SUM="19108658b23b3ec5058edc9f66ac545ea19f9537234be1ec62b714c84399366d" DEPENDS="toolchain" SUBPKG="pcre pcre-dev pcre++ pcre++-dev" -prepare() { - return -} - build() { run_configure "$1" make -j $NUMJOBS diff --git a/pkg/pcre2/build b/pkg/pcre2/build index dc76ff7..536b5f6 100755 --- a/pkg/pcre2/build +++ b/pkg/pcre2/build @@ -6,10 +6,6 @@ SHA256SUM="74c473ffaba9e13db6951fd146e0143fe9887852ce73406a03277af1d9b798ca" DEPENDS="toolchain" SUBPKG="pcre2-16 pcre2-16-dev pcre2-32 pcre2-32-dev pcre2-posix pcre2-posix-dev" -prepare() { - return -} - build() { run_configure "$1" --enable-pcre2-16 --enable-pcre2-32 make -j $NUMJOBS diff --git a/pkg/procps-ng/build b/pkg/procps-ng/build index 088e5de..ad989ce 100755 --- a/pkg/procps-ng/build +++ b/pkg/procps-ng/build @@ -6,10 +6,6 @@ SHA256SUM="925eacd65dedcf9c98eb94e8978bbfb63f5de37294cc1047d81462ed477a20af" DEPENDS="ncurses-dev toolchain" SUBPKG="procps-ng procps-ng-dev" -prepare() { - apply_patches -} - build() { run_configure "$1" --enable-watch8bit --with-ncurses \ --without-systemd --disable-kill --disable-numa diff --git a/pkg/psmisc/build b/pkg/psmisc/build index 8874bd3..8ed09a1 100755 --- a/pkg/psmisc/build +++ b/pkg/psmisc/build @@ -5,10 +5,6 @@ URL="https://sourceforge.net/projects/psmisc/files/psmisc" SHA256SUM="41750e1a5abf7ed2647b094f58127c73dbce6876f77ba4e0a7e0995ae5c7279a" DEPENDS="ncurses-dev toolchain" -prepare() { - return -} - build() { run_configure "$1" --disable-selinux make -j $NUMJOBS diff --git a/pkg/readline/build b/pkg/readline/build index e6b355b..b1b72b3 100755 --- a/pkg/readline/build +++ b/pkg/readline/build @@ -6,10 +6,6 @@ SHA256SUM="e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" DEPENDS="ncurses-dev toolchain" SUBPKG="readline readline-dev" -prepare() { - return -} - build() { run_configure "$1" make SHLIB_LIBS="-lncursesw" -j $NUMJOBS diff --git a/pkg/release-alix/build b/pkg/release-alix/build index 30a8a89..185ce0c 100755 --- a/pkg/release-alix/build +++ b/pkg/release-alix/build @@ -29,7 +29,3 @@ deploy() { tar czf "$BUILDROOT/release.tar.gz" * touch "$PKGDEPLOYDIR/release.files" "$PKGDEPLOYDIR/release.desc" } - -check_update() { - return -} diff --git a/pkg/release-qemu/build b/pkg/release-qemu/build index ef776f9..5d935e2 100755 --- a/pkg/release-qemu/build +++ b/pkg/release-qemu/build @@ -33,8 +33,3 @@ deploy() { tar czf "$BUILDROOT/release.tar.gz" * touch "$PKGDEPLOYDIR/release.files" "$PKGDEPLOYDIR/release.desc" } - -check_update() { - return -} - diff --git a/pkg/release-rpi3/build b/pkg/release-rpi3/build index e442dd0..d2a2694 100755 --- a/pkg/release-rpi3/build +++ b/pkg/release-rpi3/build @@ -34,7 +34,3 @@ deploy() { tar czf "$BUILDROOT/release.tar.gz" * touch "$PKGDEPLOYDIR/release.files" "$PKGDEPLOYDIR/release.desc" } - -check_update() { - return -} diff --git a/pkg/rootfs/build b/pkg/rootfs/build index 1ceca7a..802553a 100755 --- a/pkg/rootfs/build +++ b/pkg/rootfs/build @@ -35,11 +35,3 @@ dir cfg/preserve/var_lib 0755 0 0 dir cfg/overlay 0755 0 0 _EOF } - -deploy() { - return -} - -check_update() { - return -} diff --git a/pkg/rpi-vc/build b/pkg/rpi-vc/build index 8dbc591..4744a20 100644 --- a/pkg/rpi-vc/build +++ b/pkg/rpi-vc/build @@ -6,10 +6,6 @@ SHA256SUM="4336d10e0ff93adfa2e93f3520e102a30c009ee0f823bb1d391edf9ab17b3f0f" DEPENDS="toolchain" SUBPKG="rpi-vc rpi-vc-dev gles2 gles2-dev" -prepare() { - return -} - build() { local cflags="-O2 -Os" local ldflags="" @@ -38,7 +34,3 @@ deploy() { cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR" } - -check_update() { - return -} diff --git a/pkg/sed/build b/pkg/sed/build index bff0402..934e1e8 100755 --- a/pkg/sed/build +++ b/pkg/sed/build @@ -5,10 +5,6 @@ URL="https://ftp.gnu.org/gnu/sed/" SHA256SUM="f79b0cfea71b37a8eeec8490db6c5f7ae7719c35587f21edb0617f370eeff633" DEPENDS="toolchain" -prepare() { - return -} - build() { run_configure "$1" make -j $NUMJOBS diff --git a/pkg/sqlite3/build b/pkg/sqlite3/build index 8e8af24..ab3e54b 100755 --- a/pkg/sqlite3/build +++ b/pkg/sqlite3/build @@ -6,10 +6,6 @@ SHA256SUM="d61b5286f062adfce5125eaf544d495300656908e61fca143517afcc0a89b7c3" DEPENDS="readline-dev zlib-dev toolchain" SUBPKG="sqlite3 sqlite3-dev sqlite3-shell" -prepare() { - apply_patches -} - build() { run_configure "$1" --enable-readline --disable-static-shell make -j $NUMJOBS diff --git a/pkg/tar/build b/pkg/tar/build index cbac1a3..4aa9ac9 100755 --- a/pkg/tar/build +++ b/pkg/tar/build @@ -5,10 +5,6 @@ URL="https://ftp.gnu.org/gnu/tar/" SHA256SUM="d0d3ae07f103323be809bc3eac0dcc386d52c5262499fe05511ac4788af1fdd8" DEPENDS="toolchain" -prepare() { - return -} - build() { run_configure "$1" make -j $NUMJOBS diff --git a/pkg/tc-binutils/build b/pkg/tc-binutils/build index 28dec92..1a13d13 100755 --- a/pkg/tc-binutils/build +++ b/pkg/tc-binutils/build @@ -5,10 +5,6 @@ URL="http://ftp.gnu.org/gnu/binutils" SHA256SUM="f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952" DEPENDS="tc-pkgtool" -prepare() { - apply_patches -} - build() { local extra="$BINUTILS_EXTRACFG" diff --git a/pkg/tc-file/build b/pkg/tc-file/build index 904d2fa..aae8ea3 100755 --- a/pkg/tc-file/build +++ b/pkg/tc-file/build @@ -2,10 +2,6 @@ source "$SCRIPTDIR/pkg/file/build" DEPENDS="tc-pkgtool" SUBPKG="tc-file" -prepare() { - return -} - build() { $1/configure --prefix="$TCDIR" --disable-static \ --build="$HOSTTUPLE" --host="$HOSTTUPLE" diff --git a/pkg/tc-pkgtool/build b/pkg/tc-pkgtool/build index 822abb6..703938d 100755 --- a/pkg/tc-pkgtool/build +++ b/pkg/tc-pkgtool/build @@ -5,10 +5,6 @@ URL="https://infraroot.at/pygos" SHA256SUM="845847e139bbb6e15ada8946032d1c114a8dde52cacb3d81f1b8370edab7ed9d" DEPENDS="" -prepare() { - return -} - build() { $1/configure --prefix="$TCDIR" --disable-static \ --build="$HOSTTUPLE" --host="$HOSTTUPLE" \ @@ -24,7 +20,3 @@ deploy() { touch "$PKGDEPLOYDIR/$PKGNAME.files" touch "$PKGDEPLOYDIR/$PKGNAME.desc" } - -check_update() { - return -} diff --git a/pkg/tc-squashfs/build b/pkg/tc-squashfs/build index 9030bad..e11558d 100755 --- a/pkg/tc-squashfs/build +++ b/pkg/tc-squashfs/build @@ -5,10 +5,6 @@ URL="https://infraroot.at/pub/squashfs" SHA256SUM="aba8eccd4c0735ef7019d84a94166a866f11054fc713c4ba0fb919f1569dd7e6" DEPENDS="" -prepare() { - return -} - build() { $1/configure --prefix="$TCDIR" --disable-static \ --build="$HOSTTUPLE" --host="$HOSTTUPLE" diff --git a/pkg/tcpdump/build b/pkg/tcpdump/build index b7020a5..facf45b 100755 --- a/pkg/tcpdump/build +++ b/pkg/tcpdump/build @@ -5,10 +5,6 @@ URL="http://www.tcpdump.org/release/" SHA256SUM="2cd47cb3d460b6ff75f4a9940f594317ad456cfbf2bd2c8e5151e16559db6410" DEPENDS="libnl3-dev openssl-dev libpcap-dev toolchain" -prepare() { - apply_patches -} - build() { run_configure "$1" --with-system-libpcap --with-cap-ng \ --with-crypto="$SYSROOT" diff --git a/pkg/toolchain/build b/pkg/toolchain/build index 0980b39..12690c0 100755 --- a/pkg/toolchain/build +++ b/pkg/toolchain/build @@ -1,10 +1,6 @@ DEPENDS="tc-binutils crt-dev libstdc++-dev tc-file tc-pkgtool basefiles" DEPENDS="$DEPENDS tc-squashfs" -build() { - return -} - deploy() { cat > "$CMAKETCFILE" << _EOF set(CMAKE_SYSTEM_NAME Linux) @@ -28,7 +24,3 @@ _EOF requires $DEPENDS _EOF } - -check_update() { - return -} \ No newline at end of file diff --git a/pkg/unbound/build b/pkg/unbound/build index 63d3a81..ecb56c3 100644 --- a/pkg/unbound/build +++ b/pkg/unbound/build @@ -6,10 +6,6 @@ SHA256SUM="152f486578242fe5c36e89995d0440b78d64c05123990aae16246b7f776ce955" DEPENDS="openssl-dev expat-dev libbsd-dev toolchain" SUBPKG="unbound libunbound libunbound-dev" -prepare() { - return -} - build() { run_configure "$1" --with-pidfile=/run/unbound.pid \ --with-libexpat="$SYSROOT" --with-ssl="$SYSROOT" diff --git a/pkg/usyslog/build b/pkg/usyslog/build index efcde99..3bde006 100755 --- a/pkg/usyslog/build +++ b/pkg/usyslog/build @@ -5,10 +5,6 @@ URL="http://infraroot.at/pygos" SHA256SUM="74451c13d62cf3a55ca2c61c9d1c0f4b3bd6c485b8012be6c3565315b887237c" DEPENDS="toolchain" -prepare() { - return -} - build() { run_configure "$1" make -j $NUMJOBS @@ -18,7 +14,3 @@ deploy() { make DESTDIR="$PKGDEPLOYDIR" install cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR" } - -check_update() { - return -} diff --git a/pkg/util-linux/build b/pkg/util-linux/build index a429620..8db5297 100755 --- a/pkg/util-linux/build +++ b/pkg/util-linux/build @@ -6,10 +6,6 @@ SHA256SUM="d9de3edd287366cd908e77677514b9387b22bc7b88f45b83e1922c3597f1d7f9" DEPENDS="bash-dev ncurses-dev zlib-dev toolchain" SUBPKG="libblkid libblkid-dev libfdisk libfdisk-dev libmount libmount-dev libsmartcols libsmartcols-dev libuuid libuuid-dev util-linux" -prepare() { - apply_patches -} - build() { ADJTIME_PATH=/var/lib/hwclock/adjtime \ run_configure "$1" --disable-pylibmount --without-python \ diff --git a/pkg/xz/build b/pkg/xz/build index e11a455..151ba8f 100644 --- a/pkg/xz/build +++ b/pkg/xz/build @@ -6,10 +6,6 @@ SHA256SUM="9717ae363760dedf573dad241420c5fea86256b65bc21d2cf71b2b12f0544f4b" DEPENDS="toolchain" SUBPKG="xz xz-dev" -prepare() { - return -} - build() { run_configure "$1" make -j $NUMJOBS diff --git a/pkg/zlib/build b/pkg/zlib/build index 0a497ea..a7de97b 100644 --- a/pkg/zlib/build +++ b/pkg/zlib/build @@ -6,10 +6,6 @@ SHA256SUM="4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066" DEPENDS="toolchain" SUBPKG="zlib zlib-dev" -prepare() { - return -} - build() { local cflags="-O2 -Os" local ldflags="" diff --git a/util/emptypkg.sh b/util/emptypkg.sh new file mode 100644 index 0000000..b190b55 --- /dev/null +++ b/util/emptypkg.sh @@ -0,0 +1,15 @@ +prepare() { + apply_patches +} + +build() { + return +} + +deploy() { + return +} + +check_update() { + return +} diff --git a/util/pkgcmd.sh b/util/pkgcmd.sh index 677df0a..cd21340 100644 --- a/util/pkgcmd.sh +++ b/util/pkgcmd.sh @@ -3,6 +3,7 @@ include_pkg() { unset -f build deploy prepare check_update unset -v VERSION TARBALL URL SRCDIR SHA256SUM DEPENDS SUBPKG + source "$SCRIPTDIR/util/emptypkg.sh" source "$SCRIPTDIR/pkg/$PKGNAME/build" if [ -z "$SUBPKG" ]; then