versioning updated
This commit is contained in:
parent
b8d118af83
commit
fde09106de
@ -11,7 +11,7 @@ git clone https://github.com/bedrocklinux/bedrocklinux-userland
|
||||
cd bedrocklinux-userland
|
||||
git checkout 0.7beta -q
|
||||
current_version="$(awk '{print$3}' </bedrock/etc/bedrock-release)"
|
||||
newest_version="$(awk -F= '/^VERSION=/{print$2}' Makefile | sed 's/[a-z].*$//')git$(git log | grep -c '^commit')"
|
||||
newest_version="$(awk -F= '/^BEDROCK_VERSION=/{print$2}' Makefile | sed 's/[a-z].*$//')git$(git log | grep -c '^commit')"
|
||||
echo "Current Version: ${current_version}"
|
||||
echo "Newest Version: ${newest_version}"
|
||||
if ver_cmp_first_newer "${newest_version}" "${current_version}"; then
|
||||
@ -26,10 +26,10 @@ else
|
||||
fi
|
||||
# Start the build process
|
||||
make clean
|
||||
if ! grep -q BEDROCK_VERSION Makefile; then # Fix bug with building BusyBox
|
||||
sed 's/VERSION/BEDROCK_VERSION/g' Makefile > Makefile-new
|
||||
mv Makefile-new Makefile
|
||||
fi
|
||||
#if ! grep -q BEDROCK_VERSION Makefile; then # Fix bug with building BusyBox
|
||||
# sed 's/VERSION/BEDROCK_VERSION/g' Makefile > Makefile-new
|
||||
# mv Makefile-new Makefile
|
||||
#fi
|
||||
make SKIPSIGN=true -j $(nproc) BEDROCK_VERSION="${newest_version}"
|
||||
/bedrock/libexec/busybox sh "bedrock-linux-${newest_version}-$(uname -m).sh" --force-update
|
||||
# Maybe clean up here in the future
|
||||
|
Loading…
x
Reference in New Issue
Block a user