X-Git-Url: http://gitweb/?a=blobdiff_plain;f=makeCrossRootfsExtras.sh;h=b20706d374a5dbcd707f592793c061c7b21e7b2b;hb=HEAD;hp=06bd4a55fe4f0e2bef38a6ecd55dac7ed640b7a1;hpb=1d2e84405ccc8306766304d406b072273ceff30a;p=devtools.git diff --git a/makeCrossRootfsExtras.sh b/makeCrossRootfsExtras.sh index 06bd4a5..b20706d 100755 --- a/makeCrossRootfsExtras.sh +++ b/makeCrossRootfsExtras.sh @@ -9,11 +9,11 @@ GIT_REPO_UPSTREAM="git://crux.nu/ports/core.git" GIT_REPO_OVERLAY="git://crux-arm.nu/crux-arm/ports/core-arm.git" # we used the tag created for CRUX and the first commit hash in CRUX-ARM -# CRUX-3.0 53d838bfaa820f8398c8f7fb15f84d6800f33abc -# CRUX-ARM 3.0 5371a9acf3548c955c0d19eed402827a6f1ac44a -GIT_BRANCH="3.0" -GIT_COMMIT_HASH_UPSTREAM="53d838bfaa820f8398c8f7fb15f84d6800f33abc" -GIT_COMMIT_HASH_OVERLAY="5371a9acf3548c955c0d19eed402827a6f1ac44a" +# CRUX-3.1 8ac5de3d6d32e963b8d90a130222052662cb6ef2 +# CRUX-ARM 3.1 574c4008c8d63ac004b5196615da9fd29ef0c1d3 +GIT_BRANCH="3.2" +GIT_COMMIT_HASH_UPSTREAM="8ac5de3d6d32e963b8d90a130222052662cb6ef2" +GIT_COMMIT_HASH_OVERLAY="c3fae79db1ed58ddea2e72d291e90617a55f2e89" PWD_DIR=$(pwd) TMP_DIR=$(mktemp -d) @@ -21,7 +21,6 @@ TMP_DIR=$(mktemp -d) cd $TMP_DIR && \ git clone $GIT_REPO_UPSTREAM && \ cd core && \ - git branch $GIT_BRANCH origin/$GIT_BRANCH && \ git checkout $GIT_BRANCH && \ git fetch && \ git reset --hard $GIT_COMMIT_HASH_UPSTREAM && \