hrev51835 adds 2 changesets to branch 'master'
old head: d87eeceea5d64289678d5796bf528b7844937ac0
new head: b1da0c3c478e946712fc523a97cd64a2255fb151
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=b1da0c3c478e+%5Ed87eeceea5d6
----------------------------------------------------------------------------
cbad07e31433: validateRepoFile: A quick validation of Jam repository definitions
Change-Id: I4e0b23dbb92a8c2377ad6e66cf63c499b66ba3ac
b1da0c3c478e: HaikuPortsCross/ppc: Fix bash/bison/icu/make versions
Change-Id: I3fb8ac8059912c0ed5cca7ebeaf07ac0a8ee759c
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 51 insertions(+), 5 deletions(-)
3rdparty/kallisti5/validateRepoFile | 46 ++++++++++++++++++++++++++
build/jam/repositories/HaikuPortsCross/ppc | 10 +++---
############################################################################
Commit: cbad07e31433abdfe55551d96de0dbf939a01158
URL: http://cgit.haiku-os.org/haiku/commit/?id=cbad07e31433
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Thu Mar 1 16:06:59 2018 UTC
Committer: Alexander von Gluck IV <alex.vongluck@xxxxxxxxxx>
Commit-Date: Tue Mar 6 23:39:46 2018 UTC
validateRepoFile: A quick validation of Jam repository definitions
Change-Id: I4e0b23dbb92a8c2377ad6e66cf63c499b66ba3ac
----------------------------------------------------------------------------
diff --git a/3rdparty/kallisti5/validateRepoFile
b/3rdparty/kallisti5/validateRepoFile
new file mode 100755
index 0000000000..e69e7d3886
--- /dev/null
+++ b/3rdparty/kallisti5/validateRepoFile
@@ -0,0 +1,46 @@
+#!/bin/bash
+# Check if a Jam repository file is valid with our requirements
+# Ex: validateRepo build/jam/repositories/HaikuPorts/arm
+
+if [ $# -ne 1 ]; then
+ echo "usage: validate <repo_file>"
+ exit 1
+fi
+
+if [ ! -f "$1" ]; then
+ echo "Error: Unable to read repo_file '$1'!"
+ exit 1
+fi
+
+remote_file_exists() {
+ HTTP_STATUS=$(curl -s -I -L "$1" | head -n1 | awk '{ print $2 }')
+ echo "Check $HTTP_STATUS - $1"
+ if [ "$HTTP_STATUS" != "200" ]; then
+ return 0;
+ fi
+ return 1;
+}
+
+REPO_FILE="$1"
+SHA256=$(sha256sum $REPO_FILE | awk '{ print $1 }')
+ARCHITECTURE=$(cat $REPO_FILE | tr '\n' ' ' | awk '{ print $4 } ')
+REPO_URL=$(cat $REPO_FILE | tr '\n' ' ' | awk '{ print $6 } ')
+REPO_EXPECT=$(cat $REPO_FILE | grep -v "#" | tr '\n' ' ' | cut -d':' -f6)
+
+if remote_file_exists "$REPO_URL/$SHA256/package.list" ; then
+ echo "Remote repository doesn't exist!"
+ exit 1
+fi
+
+PACKAGES=""
+for i in $(curl -s -L $REPO_URL/$SHA256/package.list | tr '\n' ' '); do
+ PACKAGES="$PACKAGES $(basename $(echo "$i" | cut -d'-' -f1,2,3))"
+done
+
+for i in $REPO_EXPECT; do
+ if [[ $PACKAGES = *$i* ]]; then
+ echo "OK $i"
+ else
+ echo "WARN $i"
+ fi
+done
############################################################################
Revision: hrev51835
Commit: b1da0c3c478e946712fc523a97cd64a2255fb151
URL: http://cgit.haiku-os.org/haiku/commit/?id=b1da0c3c478e
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Wed Mar 7 03:52:30 2018 UTC
HaikuPortsCross/ppc: Fix bash/bison/icu/make versions
Change-Id: I3fb8ac8059912c0ed5cca7ebeaf07ac0a8ee759c
----------------------------------------------------------------------------
diff --git a/build/jam/repositories/HaikuPortsCross/ppc
b/build/jam/repositories/HaikuPortsCross/ppc
index 248d9d6cb0..8a975a4776 100644
--- a/build/jam/repositories/HaikuPortsCross/ppc
+++ b/build/jam/repositories/HaikuPortsCross/ppc
@@ -10,9 +10,9 @@ BootstrapPackageRepository HaikuPortsCross
gcc_bootstrap_syslibs_devel-5.4.0_2016_06_04-1
:
# repository architecture packages (stage 1)
- bash_bootstrap-4.3.42-1
+ bash_bootstrap-4.4.012-1
binutils_bootstrap-2.26.1_2016_02_29-1
- bison_bootstrap-2.4.3-1
+ bison_bootstrap-3.0.4-5
coreutils_bootstrap-8.22-1
curl_bootstrap-7.40.0-1
curl_bootstrap_devel-7.40.0-1
@@ -24,10 +24,10 @@ BootstrapPackageRepository HaikuPortsCross
freetype_bootstrap_devel-2.6.3-1
mawk_bootstrap-1.3.4-1
grep_bootstrap-2.14-1
- icu_bootstrap-54.1-1
- icu_bootstrap_devel-54.1-1
+ icu_bootstrap-57.1-2
+ icu_bootstrap_devel-57.1-2
m4_bootstrap-1.4.16-1
- make_bootstrap-3.82-1
+ make_bootstrap-4.1-2
ncurses6_bootstrap-6.0-1
ncurses6_bootstrap_devel-6.0-1
python_bootstrap-2.7.6-1
