diff --git a/cook.sh b/cook.sh index de191d2793c7bd71c78cc5f2208153f7e5883b1d..5f99f16d777154d422da549316f7772160d61a54 100755 --- a/cook.sh +++ b/cook.sh @@ -41,28 +41,16 @@ function usage { echo " distclean" >&2 echo " build" >&2 echo " clean" >&2 - echo " diff" >&2 - echo " diff_origin" >&2 - echo " diff_upstream" >&2 - echo " difftool" >&2 - echo " difftool_origin" >&2 - echo " difftool_upstream" >&2 echo " fetch" >&2 echo " unfetch" >&2 echo " pkg" >&2 echo " unpkg" >&2 echo " prepare" >&2 echo " unprepare" >&2 - echo " publish" >&2 - echo " unpublish" >&2 echo " stage" >&2 echo " unstage" >&2 - echo " status" >&2 - echo " status_origin" >&2 - echo " status_upstream" >&2 echo " tar" >&2 echo " untar" >&2 - echo " update" >&2 echo " version" >&2 } @@ -156,108 +144,6 @@ function op { rm -f source.tar fi ;; - status) - if [ -n "$TAR" ] - then - tar --compare --file="source.tar" -C "source" --strip-components=1 2>&1 | - grep -v "tar: :" | grep -v '\(Mod time\|Mode\|Gid\|Uid\) differs' || - true - elif [ -n "$GIT" ] - then - git -C source diff --stat --color - fi - ;; - status_origin) - if [ -n "$GIT" ] - then - if [ -n "$BRANCH" ] - then - git -C source diff --stat --color "origin/$BRANCH" - else - git -C source diff --stat --color "origin/master" - fi - fi - ;; - status_upstream) - if [ -n "$GIT_UPSTREAM" ] - then - if [ -n "$BRANCH" ] - then - git -C source diff --stat --color "upstream/$BRANCH" - else - git -C source diff --stat --color "upstream/master" - fi - fi - ;; - diff) - if [ -n "$GIT" ] - then - git -C source diff - fi - ;; - diff_origin) - if [ -n "$GIT" ] - then - if [ -n "$BRANCH" ] - then - git -C source diff "origin/$BRANCH" - else - git -C source diff "origin/master" - fi - fi - ;; - diff_upstream) - if [ -n "$GIT_UPSTREAM" ] - then - if [ -n "$BRANCH" ] - then - git -C source diff "upstream/$BRANCH" - else - git -C source diff "upstream/master" - fi - fi - ;; - difftool) - if [ -n "$GIT" ] - then - git -C source difftool -d - fi - ;; - difftool_origin) - if [ -n "$GIT" ] - then - if [ -n "$BRANCH" ] - then - git -C source difftool -d "origin/$BRANCH" - else - git -C source difftool -d "origin/master" - fi - fi - ;; - difftool_upstream) - if [ -n "$GIT_UPSTREAM" ] - then - if [ -n "$BRANCH" ] - then - git -C source difftool -d "upstream/$BRANCH" - else - git -C source difftool -d "upstream/master" - fi - fi - ;; - update) - pushd source > /dev/null - skip=0 - if [ "$(type -t recipe_update)" = "function" ] - then - recipe_update - fi - if [ "$skip" -eq "0" ] - then - "${CARGO[@]}" update - fi - popd > /dev/null - ;; prepare) skip=0 if [ "$(type -t recipe_prepare)" = "function" ] @@ -351,27 +237,6 @@ function op { fi popd > /dev/null ;; - test) - pushd "${COOKBOOK_BUILD}" > /dev/null - skip=0 - if [ "$(type -t recipe_test)" = "function" ] - then - recipe_test - fi - - release_flag="--release" - if [ "$DEBUG" == 1 ] - then - release_flag= - fi - - if [ "$skip" -eq "0" ] - then - cp -p "$ROOT/Xargo.toml" "Xargo.toml" - "${CARGO[@]}" test --no-run --target "$TARGET" $release_flag $CARGOFLAGS - fi - popd > /dev/null - ;; clean) pushd "${COOKBOOK_BUILD}" > /dev/null skip=0 @@ -484,15 +349,6 @@ function op { untar) rm -rfv "${COOKBOOK_STAGE}.tar.gz" "${COOKBOOK_STAGE}.sig" "${COOKBOOK_STAGE}.toml" ;; - publish) - mkdir -p "$REPO" - cp -v "${COOKBOOK_STAGE}.tar.gz" "$REPO/$1.tar.gz" - cp -v "${COOKBOOK_STAGE}.sig" "$REPO/$1.sig" - cp -v "${COOKBOOK_STAGE}.toml" "$REPO/$1.toml" - ;; - unpublish) - rm -rfv "$REPO/$1.tar.gz" "$REPO/$1.sig" "$REPO/$1.toml" - ;; *) usage $1 ;; diff --git a/recipes/atk/recipe.sh b/recipes/atk/recipe.sh index 1451b72b4cd0b1a8460979d08885d12d11ec89fa..7fd1786db9ea0f7469c8601394ab780a6c799f01 100755 --- a/recipes/atk/recipe.sh +++ b/recipes/atk/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { wget -O config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" sysroot="$(realpath ../sysroot)" @@ -29,11 +24,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/autoconf/recipe.sh b/recipes/autoconf/recipe.sh index 28fe7211ed41f4f81d664968d661350082dc8f31..7a4c251cbc9bef625ed111f23b6d41877c35da71 100644 --- a/recipes/autoconf/recipe.sh +++ b/recipes/autoconf/recipe.sh @@ -6,11 +6,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { wget -O build-aux/config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" ./configure --build=${BUILD} --host=${HOST} --prefix='' @@ -18,11 +13,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/automake/recipe.sh b/recipes/automake/recipe.sh index 9f97b2c0aa3ff7f2c563650a21617ffa15b2b578..e93706dc873bcb101199909b0102034a9690dd3f 100644 --- a/recipes/automake/recipe.sh +++ b/recipes/automake/recipe.sh @@ -6,11 +6,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { wget -O lib/config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" sed -i 's|.*/doc/help2man.*|\&\& true|' Makefile.in @@ -21,11 +16,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/cairo/recipe.sh b/recipes/cairo/recipe.sh index d20973a328efd1680a3b8018db87a866706721a3..3c8e53639bc1bac63058ccc56dc8faaae5ab8d74 100755 --- a/recipes/cairo/recipe.sh +++ b/recipes/cairo/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { #Workaround to disable the not redox compatible tests printf "all:\n\ninstall:\n" > ./test/Makefile.in @@ -31,11 +26,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/cairodemo/recipe.sh b/recipes/cairodemo/recipe.sh index b26b42cf9f75cf98c58a78165607b4fdd7388333..3a42c66cc23667d2318418292970f95b85ee80c2 100755 --- a/recipes/cairodemo/recipe.sh +++ b/recipes/cairodemo/recipe.sh @@ -5,11 +5,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_prepare { rm -rf source mkdir source @@ -26,11 +21,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/cmatrix/recipe.sh b/recipes/cmatrix/recipe.sh index d721f308461b3e7b443059240c23a10b9efdd41d..eac097f3b650cf2cd043bcfe6085105ad2a5a3ba 100644 --- a/recipes/cmatrix/recipe.sh +++ b/recipes/cmatrix/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" export LDFLAGS="-L$sysroot/lib -static" @@ -27,11 +22,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/diffutils/recipe.sh b/recipes/diffutils/recipe.sh index 5d2cc77bd68d7788154257c190e6013c22e830c9..a7f57fb85d309dd17fe8ddb924c07429a4fb30e4 100644 --- a/recipes/diffutils/recipe.sh +++ b/recipes/diffutils/recipe.sh @@ -6,11 +6,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { export LDFLAGS="-static" autoreconf @@ -27,11 +22,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/dosbox/recipe.sh b/recipes/dosbox/recipe.sh index 45b11c95836fbd988db42fc30e62b899f1fd529b..c45c96f1611d18b92882ccaeb783770145c3aca6 100644 --- a/recipes/dosbox/recipe.sh +++ b/recipes/dosbox/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include/SDL" @@ -30,11 +25,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/duktape/recipe.sh b/recipes/duktape/recipe.sh index 5b8ccb92ee71a86ce4842e4c9c056fc219990089..7333170758b3764b654b92d34880bb7f0893912f 100644 --- a/recipes/duktape/recipe.sh +++ b/recipes/duktape/recipe.sh @@ -6,22 +6,12 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sed -i "s/= gcc/= $TARGET-gcc/g" Makefile.cmdline "$REDOX_MAKE" -f Makefile.cmdline -j"$($NPROC)" skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/eduke32/recipe.sh b/recipes/eduke32/recipe.sh index a67de8d405141c733e3196753b763ac85329539c..658c2d0dc4aa07ecd5a4fd384975cef3d3200830 100644 --- a/recipes/eduke32/recipe.sh +++ b/recipes/eduke32/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include -I$sysroot/include/SDL" @@ -22,11 +17,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/ffmpeg/recipe.sh b/recipes/ffmpeg/recipe.sh index 4ec76020918b18c57b42787ae0853c0828afe415..f067b3d5868150b8c20d29554a7bfeafd8ba026d 100644 --- a/recipes/ffmpeg/recipe.sh +++ b/recipes/ffmpeg/recipe.sh @@ -8,11 +8,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$PWD/../sysroot" export CPPFLAGS="-I$sysroot/include" @@ -31,11 +26,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/fontconfig/recipe.sh b/recipes/fontconfig/recipe.sh index 81f034092d8a9bcd57d76086af080ab9ba4a9c28..d3382aef8941cc4e21218b7e8a3f2b0bcdca1bf6 100755 --- a/recipes/fontconfig/recipe.sh +++ b/recipes/fontconfig/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { wget -O config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" sysroot="$(realpath ../sysroot)" @@ -29,11 +24,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/freeciv/recipe.sh b/recipes/freeciv/recipe.sh index b62660d904a533d1ba63c197b1dfdb1cd6369974..c97e02c29c036c0e6bbd034837b3f3c51ea3f546 100644 --- a/recipes/freeciv/recipe.sh +++ b/recipes/freeciv/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { wget -O bootstrap/config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" sysroot="$(realpath ../sysroot)" @@ -34,11 +29,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/freedoom/recipe.sh b/recipes/freedoom/recipe.sh index f539fb1ed32b95fecd5b86f3edadbf7d2aadb553..f60d7b2f3ce1c3934842c0b27c2b04376da0ec2a 100644 --- a/recipes/freedoom/recipe.sh +++ b/recipes/freedoom/recipe.sh @@ -6,21 +6,11 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { echo "skipping build" skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { echo "skipping clean" skip=1 diff --git a/recipes/freeglut/recipe.sh b/recipes/freeglut/recipe.sh index b95be4cec7257b44593abbf16232a685404ada49..d291f77e80b227f72561c9d916bd6f4868c3b610 100644 --- a/recipes/freeglut/recipe.sh +++ b/recipes/freeglut/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include" @@ -27,11 +22,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/fribidi/recipe.sh b/recipes/fribidi/recipe.sh index c48a7309ccad16f4cf6406b17c574adf53f66bdb..33e5eaecc1e6d5e651de476773e641bb96221d6a 100755 --- a/recipes/fribidi/recipe.sh +++ b/recipes/fribidi/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include" @@ -27,11 +22,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/gawk/recipe.sh b/recipes/gawk/recipe.sh index e83aec7b57e94c45fd7e098f1dea3c87108723eb..6e616566af27cd5afa3589e41f306bcd83242149 100644 --- a/recipes/gawk/recipe.sh +++ b/recipes/gawk/recipe.sh @@ -2,22 +2,12 @@ GIT=https://gitlab.redox-os.org/redox-os/gawk.git GIT_UPSTREAM=https://git.savannah.gnu.org/git/gawk.git BRANCH=redox -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { ./configure --build=${BUILD} --host=${HOST} --prefix=/ ac_cv_func_gethostbyname=no ac_cv_func_connect=no "$REDOX_MAKE" -j"$($NPROC)" skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/gcc/recipe.sh b/recipes/gcc/recipe.sh index e7f9e4204702fd0b1faf4248795ac89cdddc2eac..c6e17ae2478c641620d396d6bbab7f905acf9299 100644 --- a/recipes/gcc/recipe.sh +++ b/recipes/gcc/recipe.sh @@ -10,11 +10,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { ./contrib/download_prerequisites cp config.sub gmp/config.sub @@ -44,11 +39,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/gdk-pixbuf/recipe.sh b/recipes/gdk-pixbuf/recipe.sh index 26a41f3ed9acac81976d82f997090f85309c819d..572c6441a56478ee81e0d257e8ca505dca278f5b 100755 --- a/recipes/gdk-pixbuf/recipe.sh +++ b/recipes/gdk-pixbuf/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" export LDFLAGS="-static" @@ -62,11 +57,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/gears/recipe.sh b/recipes/gears/recipe.sh index 2b8dc8c9b59e397e3a9b9d32e539dd43221e14fd..bbf3b4c2760d736f83a24290eac018dea406a7cc 100644 --- a/recipes/gears/recipe.sh +++ b/recipes/gears/recipe.sh @@ -5,11 +5,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_prepare { rm -rf source mkdir source @@ -24,11 +19,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/generaluser-gs/recipe.sh b/recipes/generaluser-gs/recipe.sh index 8ec0e0efb1f41856ccdc7d12c7d49e377982f5bb..6ce7fa849eb20db5215a472577739e8d3771daa9 100644 --- a/recipes/generaluser-gs/recipe.sh +++ b/recipes/generaluser-gs/recipe.sh @@ -6,21 +6,11 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { echo "skipping build" skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { echo "skipping clean" skip=1 diff --git a/recipes/gigalomania/recipe.sh b/recipes/gigalomania/recipe.sh index 6779300bb63b099a6e32a56e65b95ff90393f4af..ea713c2c952857e3967d0dba59df2fb8fbf80a20 100644 --- a/recipes/gigalomania/recipe.sh +++ b/recipes/gigalomania/recipe.sh @@ -8,11 +8,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { export CPPHOST=${HOST}-g++ sysroot="$(realpath ../sysroot)" @@ -22,11 +17,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/git/recipe.sh b/recipes/git/recipe.sh index ab8edf0cb447d89a649e27d1aa3175a437d85a50..eeb4ef660d76a881847726538e34e55b192b6d94 100644 --- a/recipes/git/recipe.sh +++ b/recipes/git/recipe.sh @@ -22,11 +22,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" export LDFLAGS="-L$sysroot/lib -static" @@ -43,11 +38,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/glib/recipe.sh b/recipes/glib/recipe.sh index a04a50b67b8c02aeb60dbca2c535335d239ec383..dede5aee8120b2bffbb1839c5380c23e0d3d55af 100644 --- a/recipes/glib/recipe.sh +++ b/recipes/glib/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include" @@ -27,11 +22,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/gnu-binutils/recipe.sh b/recipes/gnu-binutils/recipe.sh index 9d33dcd1fa7c8ddea6bd95828dec3ec085648d6d..1fbd7a510ccc4de536b36ad363b127b11301833e 100644 --- a/recipes/gnu-binutils/recipe.sh +++ b/recipes/gnu-binutils/recipe.sh @@ -8,11 +8,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" mkdir -p "$sysroot/usr" @@ -38,11 +33,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/gnu-grep/recipe.sh b/recipes/gnu-grep/recipe.sh index f68e9cd2111d2bc10c1fec3dd95b4d2ac2a29f07..1731a3b1cad7a35cca6437115948a2b0cf919cc0 100644 --- a/recipes/gnu-grep/recipe.sh +++ b/recipes/gnu-grep/recipe.sh @@ -6,11 +6,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { export LDFLAGS="-static" ./configure --build=${BUILD} --host=${HOST} --prefix=/ @@ -18,11 +13,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/gnu-make/recipe.sh b/recipes/gnu-make/recipe.sh index 38ee7c58eee2774a8ef3e4e5441187ff7394ba68..e884b055a747f82ec5c53797a981c8c51519cfb8 100644 --- a/recipes/gnu-make/recipe.sh +++ b/recipes/gnu-make/recipe.sh @@ -6,11 +6,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { export CFLAGS="-DPOSIX -DNO_ARCHIVES -DNO_OUTPUT_SYNC" export LDFLAGS="-static" @@ -23,11 +18,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/gstreamer/recipe.sh b/recipes/gstreamer/recipe.sh index b31edf680ed9cdffb5642aaac4d1dd2c4fba62a6..7fcf18a5d8d8b5ec37c9e48bce33ad36873795f4 100644 --- a/recipes/gstreamer/recipe.sh +++ b/recipes/gstreamer/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include" @@ -31,11 +26,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/harfbuzz/recipe.sh b/recipes/harfbuzz/recipe.sh index e36ffcc46272ae31ad45c49f4040faa43ac021d2..d61f70786b00acf998a9b875af2516f889822efd 100644 --- a/recipes/harfbuzz/recipe.sh +++ b/recipes/harfbuzz/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include" @@ -32,11 +27,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/jansson/recipe.sh b/recipes/jansson/recipe.sh index 0d73e8161c4489c38d3be1288860f5d44ca093e6..f0091397c65baf882e61b09549c49644a06690d1 100644 --- a/recipes/jansson/recipe.sh +++ b/recipes/jansson/recipe.sh @@ -6,11 +6,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" export LDFLAGS="-L$sysroot/lib" @@ -20,11 +15,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/keyboard-sfx/recipe.sh b/recipes/keyboard-sfx/recipe.sh index bd0a82e3aee0a470a67968d651f0bb112840b847..95de8e7b63ab4c487e7a2f91a9f178202f829ef6 100644 --- a/recipes/keyboard-sfx/recipe.sh +++ b/recipes/keyboard-sfx/recipe.sh @@ -5,21 +5,11 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { echo "skipping build" skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { echo "skipping clean" skip=1 diff --git a/recipes/libc-bench/recipe.sh b/recipes/libc-bench/recipe.sh index 23e63009e15682fe5550b1fbfad5fa57d17cb7d7..2c0f9992c541176f647d8ae84560e3d414300df9 100644 --- a/recipes/libc-bench/recipe.sh +++ b/recipes/libc-bench/recipe.sh @@ -6,21 +6,11 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { "$REDOX_MAKE" -j"$($NPROC)" skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/lua/recipe.sh b/recipes/lua/recipe.sh index 8bc39897bcb8bd8fa9a3759a13e21025b7b77d07..25aff48022d31042e2f47a84bcb2296ac1ce23f5 100644 --- a/recipes/lua/recipe.sh +++ b/recipes/lua/recipe.sh @@ -6,21 +6,11 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { "$REDOX_MAKE" generic CC="${HOST}-gcc -std=gnu99" -j"$($NPROC)" skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/mdp/recipe.sh b/recipes/mdp/recipe.sh index 20f24382d738140c86bdd02ac46eaa3c8bc1be23..ed9236bdde6378882a2b056c7e80764d4e507da0 100644 --- a/recipes/mdp/recipe.sh +++ b/recipes/mdp/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include -I$sysroot/include/ncursesw" @@ -20,11 +15,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/mesa_glu/recipe.sh b/recipes/mesa_glu/recipe.sh index 83667dcec8ec19fb1cd529e5fba7a1248e98d39f..6624442a7da87d724241706f5b033856077e092b 100644 --- a/recipes/mesa_glu/recipe.sh +++ b/recipes/mesa_glu/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include" @@ -23,11 +18,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/mgba/recipe.sh b/recipes/mgba/recipe.sh index e37552e67d31e9347f340be0c39ff3c3c1f4d115..f7baad9053dd55fc0330d969a732f90f4df58cb9 100644 --- a/recipes/mgba/recipe.sh +++ b/recipes/mgba/recipe.sh @@ -8,11 +8,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include -I$sysroot/include/SDL" @@ -35,11 +30,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/ncdu/recipe.sh b/recipes/ncdu/recipe.sh index ca3f75b6ec97b22e56360ef2f4ab2e44a8602b8b..4906dc59c8a0acae3a17ac910954c0d8b0d668b7 100644 --- a/recipes/ncdu/recipe.sh +++ b/recipes/ncdu/recipe.sh @@ -7,10 +7,6 @@ function recipe_version { echo "$VERSION" skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} function recipe_build { sysroot="$PWD/../sysroot" export CPPFLAGS="-I$sysroot/include -I$sysroot/include/ncurses" @@ -22,10 +18,6 @@ function recipe_build { "$REDOX_MAKE" -j"$($NPROC)" skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/ncurses/recipe.sh b/recipes/ncurses/recipe.sh index c918950b6436d8ed1d60e58c1c5980d58731f866..590cbfedb9d4d927b58822576cf74d67d08c0c0d 100644 --- a/recipes/ncurses/recipe.sh +++ b/recipes/ncurses/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { ./configure \ --build=${BUILD} \ @@ -26,11 +21,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/ncursesw/recipe.sh b/recipes/ncursesw/recipe.sh index 407eb073a551ce92bb30e081e7cbeceb11075be8..485e2c54a992da0629e181c2e7c12f35fec5795b 100644 --- a/recipes/ncursesw/recipe.sh +++ b/recipes/ncursesw/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { export CPPFLAGS="-P" ./configure --build=${BUILD} --host=${HOST} --prefix="" --enable-widec --disable-db-install @@ -19,11 +14,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/netsurf/recipe.sh b/recipes/netsurf/recipe.sh index ac4be6addc75b80bf734c9426ea128ad1ef518ac..7813ab5aa989f3568569bf1969afc54169a4e8ac 100644 --- a/recipes/netsurf/recipe.sh +++ b/recipes/netsurf/recipe.sh @@ -8,11 +8,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" export TARGET="framebuffer" @@ -24,11 +19,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/neverball/recipe.sh b/recipes/neverball/recipe.sh index 859b63e6a6bd2f0f2c884e48262d27b2bded19e2..3edbb90eda491e68e12d260047a013c9bdb5a9a3 100644 --- a/recipes/neverball/recipe.sh +++ b/recipes/neverball/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { env -i PATH=/usr/bin:/bin PKG_CONFIG=pkg-config \ "$REDOX_MAKE" -j"$($NPROC)" ENABLE_FS=stdio mapc sols @@ -23,11 +18,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/newlib/recipe.sh b/recipes/newlib/recipe.sh index 8b74cab1e3b477fdc734933e3f88f636503c081f..acb5d42225e5f0454bcf786b2e6db87c59a7b043 100644 --- a/recipes/newlib/recipe.sh +++ b/recipes/newlib/recipe.sh @@ -6,11 +6,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { pushd newlib/libc/sys aclocal-1.11 -I ../.. @@ -30,11 +25,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/newlibtest/recipe.sh b/recipes/newlibtest/recipe.sh index fde9fd630ae7ff8abd1619f6eebc97ca51926889..3382710957b21b97003c986c70aeb75706b05746 100644 --- a/recipes/newlibtest/recipe.sh +++ b/recipes/newlibtest/recipe.sh @@ -6,11 +6,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" export CFLAGS="-static -nostdinc -I $sysroot/include -I /usr/lib/gcc/x86_64-unknown-redox/7.0.1/include/ -nostdlib -L $sysroot/lib" @@ -20,11 +15,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/openjazz/recipe.sh b/recipes/openjazz/recipe.sh index b9e7fc09a1d5719df0e7659e323e8450616fe7b7..1a8dafbe7a026b7b217364c1fd395708b68bcd10 100644 --- a/recipes/openjazz/recipe.sh +++ b/recipes/openjazz/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include -UUSE_SOCKETS -UUSE_SDL_NET" @@ -26,11 +21,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/openttd-opengfx/recipe.sh b/recipes/openttd-opengfx/recipe.sh index 4ed7e56d9a2475559c7439ece7560f6cab8181d2..a68b27b94e4f822a51a6f1e474bbd737f3aa2972 100644 --- a/recipes/openttd-opengfx/recipe.sh +++ b/recipes/openttd-opengfx/recipe.sh @@ -5,21 +5,11 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { echo "skipping build" skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { echo "skipping clean" skip=1 diff --git a/recipes/openttd-openmsx/recipe.sh b/recipes/openttd-openmsx/recipe.sh index 8c4c01245d4a2892e33a9eb1a599474908f60b36..7af78cbb15cca610af130afdf9ae18df1ee39d2d 100644 --- a/recipes/openttd-openmsx/recipe.sh +++ b/recipes/openttd-openmsx/recipe.sh @@ -5,21 +5,11 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { echo "skipping build" skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { echo "skipping clean" skip=1 @@ -30,5 +20,3 @@ function recipe_stage { cp -Rv ./* "$1/share/games/openttd/baseset/openmsx" skip=1 } - - diff --git a/recipes/openttd-opensfx/recipe.sh b/recipes/openttd-opensfx/recipe.sh index ab6f5122b4427e3fb66483afbc20fbf23ae5e752..c8219d68dd1552ce4a0d7a82457d71e5b42155b7 100644 --- a/recipes/openttd-opensfx/recipe.sh +++ b/recipes/openttd-opensfx/recipe.sh @@ -5,21 +5,11 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { echo "skipping build" skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { echo "skipping clean" skip=1 @@ -30,5 +20,3 @@ function recipe_stage { cp -Rv ./* "$1/share/games/openttd/baseset/opensfx" skip=1 } - - diff --git a/recipes/openttd/recipe.sh b/recipes/openttd/recipe.sh index 0fd408f768067c1031ebadb1d6cde1371d08027d..a7e079a45bf58e3750dd595ee6acc34707cbcd36 100644 --- a/recipes/openttd/recipe.sh +++ b/recipes/openttd/recipe.sh @@ -8,11 +8,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include" @@ -29,11 +24,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/osdemo/recipe.sh b/recipes/osdemo/recipe.sh index 299170255549fe7f304eb5f8953179bb980840d9..99942a1075aaf7ee5dbb4b2bbe9c5f83850b53dc 100644 --- a/recipes/osdemo/recipe.sh +++ b/recipes/osdemo/recipe.sh @@ -5,11 +5,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_prepare { rm -rf source mkdir source @@ -24,11 +19,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/pango/recipe.sh b/recipes/pango/recipe.sh index 6b051eab1ed1af19631134ac529065598caaf3b0..c03bbd07194dd11de0e2eaed1845d9f2e08b3da1 100755 --- a/recipes/pango/recipe.sh +++ b/recipes/pango/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { wget -O config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" sysroot="$(realpath ../sysroot)" @@ -28,11 +23,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/patch/recipe.sh b/recipes/patch/recipe.sh index 3e46d2ab4ad4ca470021900805a28794ef924388..831d1a57038df6f8ebd3276c3fb68d4f8b4b36a4 100644 --- a/recipes/patch/recipe.sh +++ b/recipes/patch/recipe.sh @@ -6,11 +6,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { export LDFLAGS="-static" wget -O build-aux/config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" @@ -20,11 +15,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/perl/recipe.sh b/recipes/perl/recipe.sh index 39c9cce6eb8f4e70971443fa326156327fb263e4..4d173db4665b69b3b9231d3b152d1b8349863032 100644 --- a/recipes/perl/recipe.sh +++ b/recipes/perl/recipe.sh @@ -8,11 +8,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { curl -L -O --time-cond perl-cross-1.1.6.tar.gz https://github.com/arsv/perl-cross/releases/download/1.1.6/perl-cross-1.1.6.tar.gz tar --strip-components=1 -xvf perl-cross-1.1.6.tar.gz @@ -26,11 +21,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/pixman/recipe.sh b/recipes/pixman/recipe.sh index 70a762e1188c7d1e1888466a5aad11d60096c11f..c6a90c9de4a85cbb81c69b760c00e2088104f57f 100755 --- a/recipes/pixman/recipe.sh +++ b/recipes/pixman/recipe.sh @@ -6,11 +6,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" ./configure \ @@ -23,11 +18,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/pkg-config/recipe.sh b/recipes/pkg-config/recipe.sh index 0514e9168c31dc41ade7d3097a5d7b4b6887daa3..50e549aab0d67eeb0c45ac6136fb1de261f08229 100755 --- a/recipes/pkg-config/recipe.sh +++ b/recipes/pkg-config/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { wget -O config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" export LDFLAGS="--static" @@ -25,11 +20,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/prboom/recipe.sh b/recipes/prboom/recipe.sh index 77c8c8cd22bc7810d75d38401668e812ca1fb187..6fd9744134c29fd3e9148f73b71b8938bed873b3 100644 --- a/recipes/prboom/recipe.sh +++ b/recipes/prboom/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { export CFLAGS="-static" sysroot="$(realpath ../sysroot)" @@ -30,11 +25,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/python/recipe.sh b/recipes/python/recipe.sh index 6ec06c195afc7f16050792f1ff16a9c91728ace2..3f3b73072201df5ac3b115ea1f0ce22104fb9ed3 100644 --- a/recipes/python/recipe.sh +++ b/recipes/python/recipe.sh @@ -9,11 +9,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { export LDFLAGS="-static" cp ../config.site ./ @@ -30,11 +25,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/qemu/recipe.sh b/recipes/qemu/recipe.sh index a62e7d9ffbe51a338e2823dd0aca4fccfb3dd2df..f14bb48ddcb22082ab5fc1d1eaebbaaac59cd4e7 100644 --- a/recipes/qemu/recipe.sh +++ b/recipes/qemu/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include" @@ -25,11 +20,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/rust/recipe.sh b/recipes/rust/recipe.sh index 2d1c4d36071ec8377e72f10dbc6b6704e238454f..6bc5913342c89b606e5c714072da09cfa5d57871 100644 --- a/recipes/rust/recipe.sh +++ b/recipes/rust/recipe.sh @@ -9,21 +9,9 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { - config="$(realpath "${COOKBOOK_RECIPE}/config.toml")" - source="$(realpath ../source)" unset AR AS CC CXX LD NM OBJCOPY OBJDUMP RANLIB READELF STRIP - python3 "$source/x.py" install --config "$config" --jobs $(nproc) --incremental - skip=1 -} - -function recipe_test { - echo "skipping test" + python3 "${COOKBOOK_SOURCE}/x.py" install --config "${COOKBOOK_RECIPE}/config.toml" --jobs $(nproc) --incremental skip=1 } diff --git a/recipes/rustual-boy/recipe.sh b/recipes/rustual-boy/recipe.sh index 80ec576b64eff811cdc8b2224c35a7bb3cda6f3b..1d5f222f2b8a1d34a4d0625476d6bb11ad13ea71 100755 --- a/recipes/rustual-boy/recipe.sh +++ b/recipes/rustual-boy/recipe.sh @@ -3,10 +3,6 @@ GIT_UPSTREAM=https://github.com/emu-rs/rustual-boy.git BRANCH="redox" DEPENDS="orbital" -function recipe_update { - cd rustual-boy-cli -} - function recipe_build { cd rustual-boy-cli } diff --git a/recipes/schismtracker/recipe.sh b/recipes/schismtracker/recipe.sh index 5e3d9d6fee987bd329dce47bfee0713bcfc0f57f..fb81410ff33b24c5b2d33991759d45821d988f1b 100644 --- a/recipes/schismtracker/recipe.sh +++ b/recipes/schismtracker/recipe.sh @@ -8,11 +8,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="${PWD}/../sysroot" export CFLAGS="-I$sysroot/include -I$sysroot/include/SDL" @@ -24,11 +19,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/scummvm/recipe.sh b/recipes/scummvm/recipe.sh index df55a301d9a7e3eaa30fb6570ccc509942f45299..fab27b6ab0e66f8bc444d2aaa850726819034029 100644 --- a/recipes/scummvm/recipe.sh +++ b/recipes/scummvm/recipe.sh @@ -8,11 +8,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { wget -O config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" sysroot="$(realpath ../sysroot)" @@ -30,11 +25,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/sdl-player/recipe.sh b/recipes/sdl-player/recipe.sh index 8953164de6fc39980802988d5314f6145cfee410..c948178a5e85b4819f5783dc8cfa68d202e843eb 100644 --- a/recipes/sdl-player/recipe.sh +++ b/recipes/sdl-player/recipe.sh @@ -6,11 +6,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" export CPPFLAGS="-I$sysroot/include" @@ -19,11 +14,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/sdl2_gears/recipe.sh b/recipes/sdl2_gears/recipe.sh index 30296bbcaf46b5dc8ea4a196ba479fb147cd46e7..8ae41967bb276a652ed74f5faa8eb770b11191f4 100644 --- a/recipes/sdl2_gears/recipe.sh +++ b/recipes/sdl2_gears/recipe.sh @@ -5,11 +5,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_prepare { rm -rf source mkdir source @@ -26,11 +21,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { echo "skipping clean" skip=1 diff --git a/recipes/sdl2_ttf/recipe.sh b/recipes/sdl2_ttf/recipe.sh index 75c6e2d1d6f12a437e1a68fa7994d20decbe8b59..b6916b8c9cc81b72801abb417e98f335ec2dd062 100644 --- a/recipes/sdl2_ttf/recipe.sh +++ b/recipes/sdl2_ttf/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include" @@ -23,11 +18,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/sdl_gfx/recipe.sh b/recipes/sdl_gfx/recipe.sh index 089890fce0ed7b5b10bc5fbf994b318baa7b3e84..d3fdbba6efb12dcb96081b925f11eb984ec02c23 100644 --- a/recipes/sdl_gfx/recipe.sh +++ b/recipes/sdl_gfx/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include" @@ -22,11 +17,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/sdl_image/recipe.sh b/recipes/sdl_image/recipe.sh index 7bbf8735be391cc9f7f4e0479d3f6adecdcd06d2..cda7f4fa39541d4baa011d28ccffb22cd4a3902f 100644 --- a/recipes/sdl_image/recipe.sh +++ b/recipes/sdl_image/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include" @@ -22,11 +17,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/sdl_mixer/recipe.sh b/recipes/sdl_mixer/recipe.sh index 9ed93a827e79d67ab8132044c9484b3a9b13d904..5781e64d8c8f389dab943711674a329628325c41 100644 --- a/recipes/sdl_mixer/recipe.sh +++ b/recipes/sdl_mixer/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include" @@ -34,11 +29,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/sdl_ttf/recipe.sh b/recipes/sdl_ttf/recipe.sh index ce591b550f4916202146af95c4e4cd41d0c56ce5..8b40579de146f5b0820819eb70e03b4926c45d15 100644 --- a/recipes/sdl_ttf/recipe.sh +++ b/recipes/sdl_ttf/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include -I$sysroot/include/freetype2" @@ -22,11 +17,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/servo/recipe.sh b/recipes/servo/recipe.sh index ca27d281d6994e9dd69ce9d43ecd2fcd474fff8d..a436c4c30fc9f26bc212a817175590225ed6a4a2 100644 --- a/recipes/servo/recipe.sh +++ b/recipes/servo/recipe.sh @@ -9,11 +9,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { source="$(realpath ../source)" unset AR AS CC CXX LD NM OBJCOPY OBJDUMP RANLIB READELF STRIP @@ -21,11 +16,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { echo "skipping clean" skip=1 diff --git a/recipes/shared-mime-info/recipe.sh b/recipes/shared-mime-info/recipe.sh index 90779ca42306032443336078d71d0141c58d8f80..005568faa177bebce7089497a9f1142ff93c699f 100755 --- a/recipes/shared-mime-info/recipe.sh +++ b/recipes/shared-mime-info/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include" @@ -24,11 +19,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/sopwith/recipe.sh b/recipes/sopwith/recipe.sh index 678f56f72c1c0076b7535334f871052b5984e939..d46033245a1b0c1158d13013b51baab928fca588 100644 --- a/recipes/sopwith/recipe.sh +++ b/recipes/sopwith/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { wget -O autotools/config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" sysroot="$(realpath ../sysroot)" @@ -27,11 +22,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/ssh/recipe.sh b/recipes/ssh/recipe.sh index 1f9ba2bd3bf6f58654a8ed302c1e841b60bf94ac..07b365a4b3211a6f3f60046dfdf2f7baa40b2833 100644 --- a/recipes/ssh/recipe.sh +++ b/recipes/ssh/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" export LDFLAGS="-L$sysroot/lib" @@ -21,11 +16,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/syobonaction/recipe.sh b/recipes/syobonaction/recipe.sh index 6705a916c47accebe25e8525dc420aa6421335f8..5c50b4b1129627cdba9682dc124fa3867e1b3ac7 100644 --- a/recipes/syobonaction/recipe.sh +++ b/recipes/syobonaction/recipe.sh @@ -7,11 +7,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" export SDL_CONFIG="${PKG_CONFIG} sdl" @@ -21,11 +16,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/terminfo/recipe.sh b/recipes/terminfo/recipe.sh index 2321f0df0b7763fd0d2281ebcfcfe3defb4b4c64..8fdee2fcfd19e4820f1105b0964a34e53a8d06d6 100644 --- a/recipes/terminfo/recipe.sh +++ b/recipes/terminfo/recipe.sh @@ -5,21 +5,11 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { echo "skipping build" skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { echo "skipping clean" skip=1 diff --git a/recipes/timidity/recipe.sh b/recipes/timidity/recipe.sh index 4a0a15271477520efb97376ba0e4c82ff340c4b6..9edf5e433c8dcd39d51305d202c441c7fd48b1f6 100644 --- a/recipes/timidity/recipe.sh +++ b/recipes/timidity/recipe.sh @@ -8,11 +8,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { export LDFLAGS="-static" autoreconf -f -i @@ -26,11 +21,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/ttf-hack/recipe.sh b/recipes/ttf-hack/recipe.sh index b68307261180a8a5af0e6051fb821ed383dcdde5..94bf53c83a7b905151c0d4e50d9185b9e2178776 100644 --- a/recipes/ttf-hack/recipe.sh +++ b/recipes/ttf-hack/recipe.sh @@ -6,21 +6,11 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { echo "skipping build" skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { echo "skipping clean" skip=1 diff --git a/recipes/vice/recipe.sh b/recipes/vice/recipe.sh index 1c0c64c55a505e69ee4df3514e0ccc2b68c78d33..42da781950433c4ca3a11c93b03c01432d160001 100644 --- a/recipes/vice/recipe.sh +++ b/recipes/vice/recipe.sh @@ -8,11 +8,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" wget -O config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" @@ -35,11 +30,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/vim/recipe.sh b/recipes/vim/recipe.sh index cc325653b23efe92301f636426cb81c8ffd60f2d..c4dd8182ecd949a78f10f3c67027b3341d2d06d1 100644 --- a/recipes/vim/recipe.sh +++ b/recipes/vim/recipe.sh @@ -8,11 +8,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" export LDFLAGS="-L$sysroot/lib -static" @@ -29,11 +24,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/vttest/recipe.sh b/recipes/vttest/recipe.sh index 35976b8d4b618a16cda7866795201316bec49dd0..f6a19fcdec444fe485b625d192c087acd6941378 100644 --- a/recipes/vttest/recipe.sh +++ b/recipes/vttest/recipe.sh @@ -6,11 +6,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { export LDFLAGS="-static" wget -O config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" @@ -22,11 +17,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { "$REDOX_MAKE" clean skip=1 diff --git a/recipes/wesnoth/recipe.sh b/recipes/wesnoth/recipe.sh index a9dbef18e6bdd1f905296d588cd60fa32b4f7313..03b32fa3b716f7f2ddc986d387160e606c8e7846 100644 --- a/recipes/wesnoth/recipe.sh +++ b/recipes/wesnoth/recipe.sh @@ -22,11 +22,6 @@ function recipe_version { skip=1 } -function recipe_update { - echo "skipping update" - skip=1 -} - function recipe_build { sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include" @@ -54,11 +49,6 @@ function recipe_build { skip=1 } -function recipe_test { - echo "skipping test" - skip=1 -} - function recipe_clean { rm -rf build skip=1 diff --git a/update.sh b/update.sh deleted file mode 100755 index e9604c4a8acb911b5b2874a7f1b41ec34c88c534..0000000000000000000000000000000000000000 --- a/update.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash -set -e - -source config.sh - -if [ $# = 0 ] -then - recipes="$(ls -1 recipes)" -else - recipes="$@" -fi - -for recipe in $recipes -do - if [ -d "recipes/$recipe/source" ] - then - ./cook.sh "$recipe" update - fi -done