diff --git a/buildall.sh b/buildall.sh index 88835598..763dcf2d 100644 --- a/buildall.sh +++ b/buildall.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -ex +set -e move_package(){ mkdir -p output find -type f | grep -v "output"| grep "$(uname -m).ymp$" | sort -V | while read line ; do @@ -10,12 +10,12 @@ move_package(){ find -type f | grep ympbuild | sort -V | while read line ; do name=$(basename $(dirname $line)) path=$(realpath $(dirname $line)) - if ! find ./output/ -type f | grep "${name}_" | grep "$(uname -m).ymp$" 2>/dev/null ; then + if ! find ./output/ -type f | grep "${name}_" | grep "$(uname -m).ymp$" &>/dev/null ; then echo -e "\033[33;1m<<= BINARY BUILD DONE:\033[;0m $line" - ymp --sandbox --shared="$path" build "$path" --verbose --no-source --ignore-dependency --use=all --allow-oem || exit 1 + ymp --sandbox --shared="$path" build "$path" --no-source --ignore-dependency --use=all --allow-oem || exit 1 move_package echo -e "\033[33;1m<<= BINARY BUILD DONE:\033[;0m $line" fi done -ymp index output --allow-oem --verbose --move --name="main" +ymp index output --allow-oem --move --name="main" diff --git a/system/extra/bzip2/ympbuild b/system/extra/bzip2/ympbuild index e7b96410..098cad57 100644 --- a/system/extra/bzip2/ympbuild +++ b/system/extra/bzip2/ympbuild @@ -6,8 +6,10 @@ url='https://sourceware.org/bzip2' description='lzma compression utilities and library' email='kurth4cker@tutanota.com' maintainer='kurth4cker' -source=("https://sourceware.org/pub/bzip2/bzip2-${version}.tar.gz") -md5sums=('67e051268d0c475ea773822f7500d0e5') +source=("https://sourceware.org/pub/bzip2/bzip2-${version}.tar.gz" + 'makefile.patch') +md5sums=('67e051268d0c475ea773822f7500d0e5' + 'SKIP') group=(system.extra) cd $name-$version diff --git a/system/library/libnghttp2/ympbuild b/system/library/libnghttp2/ympbuild index 4021eba4..070611a2 100644 --- a/system/library/libnghttp2/ympbuild +++ b/system/library/libnghttp2/ympbuild @@ -16,7 +16,7 @@ group=(system.library python) uses=(libxml2) libxml2_depends=(libxml2) -cd $name-$version +cd nghttp2-$version setup(){ ./configure --prefix=/usr \ diff --git a/update.sh b/update.sh index 8364e553..189c77ec 100644 --- a/update.sh +++ b/update.sh @@ -9,12 +9,12 @@ move_source(){ find -type f | grep ympbuild | sort -V | while read line ; do name=$(basename $(dirname $line)) path=$(realpath $(dirname $line)) - if ! find ./output/ -type f | grep "${name}_" | grep "source.ymp$" 2>/dev/null ; then + if ! find ./output/ -type f | grep "${name}_" | grep "source.ymp$" &>/dev/null ; then echo -e "\033[33;1m=>> SOURCE BUILD START:\033[;0m $line" - ymp --sandbox --shared="$path" build "$path" --verbose --no-binary --ignore-dependency --use=all --allow-oem + ymp --sandbox --shared="$path" build "$path" --no-binary --ignore-dependency --use=all --allow-oem move_source echo -e "\033[33;1m<<= SOURCE BUILD DONE:\033[;0m $line" fi done -ymp index output --allow-oem --verbose --move --name="main" +ymp index output --allow-oem --move --name="main"