diff --git a/build_deb.sh b/build_deb.sh index 5ff8c42cf2ff1744d6ea89d20cfb3602292a50fe..fe32ccd44414935f19232c278620ffb16f194667 100755 --- a/build_deb.sh +++ b/build_deb.sh @@ -24,7 +24,6 @@ unset KERNEL_REL unset STABLE_PATCH unset RC_KERNEL unset RC_PATCH -unset PRE_RC unset BUILD unset CC unset LINUX_GIT @@ -77,15 +76,7 @@ if [[ -a ${LINUX_GIT}/.git/config ]]; then git checkout master -f git pull - if [ "${PRE_RC}" ]; then - git branch -D v${PRE_RC}-${BUILD} || true - if [ ! "${LATEST_GIT}" ] ; then - wget -c --directory-prefix=${DIR}/patches/ http://www.kernel.org/pub/linux/kernel/${PRE_SNAP}/snapshots/patch-${PRE_RC}.bz2 - git checkout v${KERNEL_REL} -b v${PRE_RC}-${BUILD} - else - git checkout origin/master -b v${PRE_RC}-${BUILD} - fi - elif [ "${RC_PATCH}" ]; then + if [ "${RC_PATCH}" ]; then git tag | grep v${RC_KERNEL}${RC_PATCH} || git_kernel_torvalds git branch -D v${RC_KERNEL}${RC_PATCH}-${BUILD} || true if [ ! "${LATEST_GIT}" ] ; then @@ -129,22 +120,11 @@ fi function patch_kernel { cd ${DIR}/KERNEL - - if [ ! "${LATEST_GIT}" ] ; then - if [ "${PRE_RC}" ]; then - bzip2 -dc ${DIR}/patches/patch-${PRE_RC}.bz2 | patch -p1 -s - git add . - git commit -a -m ''$PRE_RC' patchset' - fi - fi - export DIR BISECT /bin/bash -e ${DIR}/patch.sh || { git add . ; exit 1 ; } git add . - if [ "${PRE_RC}" ]; then - git commit -a -m ''$PRE_RC'-'$BUILD' patchset' - elif [ "${RC_PATCH}" ]; then + if [ "${RC_PATCH}" ]; then git commit -a -m ''$RC_KERNEL''$RC_PATCH'-'$BUILD' patchset' elif [ "${STABLE_PATCH}" ] ; then git commit -a -m ''$KERNEL_REL'.'$STABLE_PATCH'-'$BUILD' patchset' diff --git a/build_kernel.sh b/build_kernel.sh index 22078ecedb438eb74bc6baa58b8b92bdfda30318..0a9c439c27e2510771991f5188d7860040045a79 100755 --- a/build_kernel.sh +++ b/build_kernel.sh @@ -24,7 +24,6 @@ unset KERNEL_REL unset STABLE_PATCH unset RC_KERNEL unset RC_PATCH -unset PRE_RC unset BUILD unset CC unset LINUX_GIT @@ -76,15 +75,7 @@ if [[ -a ${LINUX_GIT}/.git/config ]]; then git checkout master -f git pull - if [ "${PRE_RC}" ]; then - git branch -D v${PRE_RC}-${BUILD} || true - if [ ! "${LATEST_GIT}" ] ; then - wget -c --directory-prefix=${DIR}/patches/ http://www.kernel.org/pub/linux/kernel/${PRE_SNAP}/snapshots/patch-${PRE_RC}.bz2 - git checkout v${KERNEL_REL} -b v${PRE_RC}-${BUILD} - else - git checkout origin/master -b v${PRE_RC}-${BUILD} - fi - elif [ "${RC_PATCH}" ]; then + if [ "${RC_PATCH}" ]; then git tag | grep v${RC_KERNEL}${RC_PATCH} || git_kernel_torvalds git branch -D v${RC_KERNEL}${RC_PATCH}-${BUILD} || true if [ ! "${LATEST_GIT}" ] ; then @@ -128,22 +119,11 @@ fi function patch_kernel { cd ${DIR}/KERNEL - - if [ ! "${LATEST_GIT}" ] ; then - if [ "${PRE_RC}" ]; then - bzip2 -dc ${DIR}/patches/patch-${PRE_RC}.bz2 | patch -p1 -s - git add . - git commit -a -m ''$PRE_RC' patchset' - fi - fi - export DIR BISECT /bin/bash -e ${DIR}/patch.sh || { git add . ; exit 1 ; } git add . - if [ "${PRE_RC}" ]; then - git commit -a -m ''$PRE_RC'-'$BUILD' patchset' - elif [ "${RC_PATCH}" ]; then + if [ "${RC_PATCH}" ]; then git commit -a -m ''$RC_KERNEL''$RC_PATCH'-'$BUILD' patchset' elif [ "${STABLE_PATCH}" ] ; then git commit -a -m ''$KERNEL_REL'.'$STABLE_PATCH'-'$BUILD' patchset' diff --git a/build_mainline.sh b/build_mainline.sh index fa2499e220b4959ff472a927f079532814f15cb0..2708eb73bbb3712a5e781a914c71c2ace62520ce 100755 --- a/build_mainline.sh +++ b/build_mainline.sh @@ -24,7 +24,6 @@ unset KERNEL_REL unset STABLE_PATCH unset RC_KERNEL unset RC_PATCH -unset PRE_RC unset BUILD unset CC unset LINUX_GIT @@ -99,22 +98,11 @@ fi function patch_kernel { cd ${DIR}/KERNEL - - if [ ! "${LATEST_GIT}" ] ; then - if [ "${PRE_RC}" ]; then - bzip2 -dc ${DIR}/patches/patch-${PRE_RC}.bz2 | patch -p1 -s - git add . - git commit -a -m ''$PRE_RC' patchset' - fi - fi - export DIR BISECT /bin/bash -e ${DIR}/patch.sh || { git add . ; exit 1 ; } git add . - if [ "${PRE_RC}" ]; then - git commit -a -m ''$PRE_RC'-'$BUILD' patchset' - elif [ "${RC_PATCH}" ]; then + if [ "${RC_PATCH}" ]; then git commit -a -m ''$RC_KERNEL''$RC_PATCH'-'$BUILD' patchset' elif [ "${STABLE_PATCH}" ] ; then git commit -a -m ''$KERNEL_REL'.'$STABLE_PATCH'-'$BUILD' patchset' diff --git a/tools/push-n-tag-release.sh b/tools/push-n-tag-release.sh index 82a17388630d437d556ef27d2896536e293056bc..2d38cf33232c80e77425ae6e9c5078eae321340b 100644 --- a/tools/push-n-tag-release.sh +++ b/tools/push-n-tag-release.sh @@ -29,7 +29,7 @@ DIR=$PWD if [ -e ${DIR}/version.sh ]; then . version.sh - if [ "${RC_PATCH}" ]; then + if [ "${RC_PATCH}" ]; then git commit -a -m "${RC_KERNEL}${RC_PATCH}-${BUILD} release" -s git tag -a "${RC_KERNEL}${RC_PATCH}-${BUILD}" -m "${RC_KERNEL}${RC_PATCH}-${BUILD}" git push origin --tags diff --git a/tools/rebuild_deb.sh b/tools/rebuild_deb.sh index 71200803446325d67b4971b7db7a3ecc5fc98fcb..6979b61c28a9b01c039738e4f9fe267b9ca9eae9 100755 --- a/tools/rebuild_deb.sh +++ b/tools/rebuild_deb.sh @@ -24,7 +24,6 @@ unset KERNEL_REL unset STABLE_PATCH unset RC_KERNEL unset RC_PATCH -unset PRE_RC unset BUILD unset CC unset LINUX_GIT @@ -77,15 +76,7 @@ if [[ -a ${LINUX_GIT}/.git/config ]]; then git checkout master -f git pull - if [ "${PRE_RC}" ]; then - git branch -D v${PRE_RC}-${BUILD} || true - if [ ! "${LATEST_GIT}" ] ; then - wget -c --directory-prefix=${DIR}/patches/ http://www.kernel.org/pub/linux/kernel/${PRE_SNAP}/snapshots/patch-${PRE_RC}.bz2 - git checkout v${KERNEL_REL} -b v${PRE_RC}-${BUILD} - else - git checkout origin/master -b v${PRE_RC}-${BUILD} - fi - elif [ "${RC_PATCH}" ]; then + if [ "${RC_PATCH}" ]; then git tag | grep v${RC_KERNEL}${RC_PATCH} || git_kernel_torvalds git branch -D v${RC_KERNEL}${RC_PATCH}-${BUILD} || true if [ ! "${LATEST_GIT}" ] ; then @@ -129,22 +120,11 @@ fi function patch_kernel { cd ${DIR}/KERNEL - - if [ ! "${LATEST_GIT}" ] ; then - if [ "${PRE_RC}" ]; then - bzip2 -dc ${DIR}/patches/patch-${PRE_RC}.bz2 | patch -p1 -s - git add . - git commit -a -m ''$PRE_RC' patchset' - fi - fi - export DIR BISECT /bin/bash -e ${DIR}/patch.sh || { git add . ; exit 1 ; } git add . - if [ "${PRE_RC}" ]; then - git commit -a -m ''$PRE_RC'-'$BUILD' patchset' - elif [ "${RC_PATCH}" ]; then + if [ "${RC_PATCH}" ]; then git commit -a -m ''$RC_KERNEL''$RC_PATCH'-'$BUILD' patchset' elif [ "${STABLE_PATCH}" ] ; then git commit -a -m ''$KERNEL_REL'.'$STABLE_PATCH'-'$BUILD' patchset' diff --git a/version.sh b/version.sh index 23fbd6ea7f034982116157a34d5865a1d333e98f..1b8a7512eee9ac1f60e35e00e5226e1e7e7e3ac1 100644 --- a/version.sh +++ b/version.sh @@ -7,9 +7,6 @@ KERNEL_REL=3.2 #for x.x.X #STABLE_PATCH=1 -#for x.x-gitX -#PRE_RC=3.0-git23 - #for x.x-rcX #RC_KERNEL=3.2 #RC_PATCH=-rc7 @@ -22,5 +19,5 @@ BUILDREV=1.0 DISTRO=cross DEBARCH=armel -export KERNEL_REL STABLE_PATCH RC_KERNEL RC_PATCH PRE_SNAP PRE_RC BUILD +export KERNEL_REL STABLE_PATCH RC_KERNEL RC_PATCH BUILD export BUILDREV DISTRO DEBARCH ABI