X-Git-Url: http://gitweb/?a=blobdiff_plain;f=makeCrossRootfsExtras.sh;h=9a0d685923dbf9f476d985b7c4d695f0b6f8d529;hb=5e75f09f65999902d00dd89e86a435350a0c181a;hp=6580087fc47a2c6a07cb9e249b471cb2ab6634ec;hpb=b226af8829d872592315fadcc204bdb6094aaf6e;p=devtools.git diff --git a/makeCrossRootfsExtras.sh b/makeCrossRootfsExtras.sh index 6580087..9a0d685 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 77e92f931b068afe118990597ec74fcae81c23f4 -GIT_BRANCH="3.0" -GIT_COMMIT_HASH_UPSTREAM="53d838bfaa820f8398c8f7fb15f84d6800f33abc" -GIT_COMMIT_HASH_OVERLAY="77e92f931b068afe118990597ec74fcae81c23f4" +# CRUX-3.1 8ac5de3d6d32e963b8d90a130222052662cb6ef2 +# CRUX-ARM 3.1 574c4008c8d63ac004b5196615da9fd29ef0c1d3 +GIT_BRANCH="3.2" +GIT_COMMIT_HASH_UPSTREAM="8ac5de3d6d32e963b8d90a130222052662cb6ef2" +GIT_COMMIT_HASH_OVERLAY="81b69b98038355e0c6cfc40336b846d037f43b5d" 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 && \