[Qa-jenkins-scm] [jenkins.debian.net] 03/03: reproducible openwrt: move everything but main() into reproducible_openwrt_common.sh
Holger Levsen
holger at layer-acht.org
Wed Jul 13 19:02:07 UTC 2016
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch master
in repository jenkins.debian.net.
commit 2996349fee5ec1e1a587a9c181ef108577a7fb26
Author: Alexander Couzens <lynxis at fe80.eu>
Date: Wed Jul 13 18:15:18 2016 +0200
reproducible openwrt: move everything but main() into reproducible_openwrt_common.sh
to support lede and openwrt its a good idea to move common code out of the file
Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
bin/reproducible_openwrt.sh | 188 +----------------------------------
bin/reproducible_openwrt_common.sh | 194 +++++++++++++++++++++++++++++++++++++
2 files changed, 195 insertions(+), 187 deletions(-)
diff --git a/bin/reproducible_openwrt.sh b/bin/reproducible_openwrt.sh
index 6bb1934..3b2c547 100755
--- a/bin/reproducible_openwrt.sh
+++ b/bin/reproducible_openwrt.sh
@@ -13,195 +13,9 @@ common_init "$@"
# common code defining db access
. /srv/jenkins/bin/reproducible_common.sh
+. /srv/jenkins/bin/reproducible_openwrt_common.sh
set -e
-cleanup_tmpdirs() {
- cd
- # (very simple) check we are deleting the right stuff
- if [ "${TMPDIR:0:26}" != "/srv/reproducible-results/" ] || [ ${#TMPDIR} -le 26 ] || \
- [ "${TMPBUILDDIR:0:23}" != "/srv/workspace/chroots/" ] || [ ${#TMPBUILDDIR} -le 23 ] ; then
- echo "Something very strange with \$TMPDIR=$TMPDIR or \$TMPBUILDDIR=$TMPBUILDDIR, exiting instead of doing cleanup."
- exit 1
- fi
- rm -rf $TMPDIR
- rm -rf $TMPBUILDDIR
- rm -f $BANNER_HTML
-}
-
-create_results_dirs() {
- mkdir -p $BASE/openwrt/dbd
-}
-
-save_openwrt_logs() {
- local postfix="$1"
-
- tar cJf "$BASE/openwrt/dbd/logs_${postfix}.tar.xz" logs/
-}
-
-save_lede_results() {
- RUN=$1
- cd bin/targets
- for target in * ; do
- pushd $target || continue
- for subtarget in * ; do
- pushd $subtarget || continue
-
- # save firmware images
- mkdir -p $TMPDIR/$RUN/$target/$subtarget/
- for image in $(find * -name "*.bin" -o -name "*.squashfs") ; do
- cp -p $image $TMPDIR/$RUN/$target/$subtarget/
- done
-
- # save subtarget specific packages
- if [ -d packages ] ; then
- pushd packages
- for package in $(find * -name "*.ipk") ; do
- mkdir -p $TMPDIR/$RUN/packages/$target/$subtarget/$(dirname $package)
- cp -p $package $TMPDIR/$RUN/packages/$target/$subtarget/$(dirname $package)/
- done
- popd
- fi
- done
- popd
- done
-
- # arch is like mips_34kc_dsp
- popd bin/packages/
- for arch in * ; do
- pushd $arch || continue
- for package in $(find * -name "*.ipk") ; do
- mkdir -p $TMPDIR/$RUN/packages/$arch/$(dirname $package)
- cp -p $package $TMPDIR/$RUN/packages/$arch/$(dirname $package)/
- done
- popd
- done
- pushd
-}
-
-save_openwrt_results() {
- RUN=$1
- cd bin
- for i in * ; do
- cd $i
- # save images
- mkdir -p $TMPDIR/$RUN/$i
- for j in $(find * -name "*.bin" -o -name "*.squashfs") ; do
- cp -p $j $TMPDIR/$RUN/$i/
- done
- # save packages
- cd packages
- for j in $(find * -name "*.ipk") ; do
- mkdir -p $TMPDIR/$RUN/$i/$(dirname $j)
- cp -p $j $TMPDIR/$RUN/$i/$(dirname $j)/
- done
- cd ../..
- done
- cd ..
-}
-
-openwrt_config() {
- CONFIG=$1
-
- printf "$CONFIG" > .config
- printf "CONFIG_ALL=y\n" >> .config
- printf "CONFIG_CLEAN_IPKG=y\n" >> .config
- printf "CONFIG_TARGET_ROOTFS_TARGZ=y\n" >> .config
- make defconfig
-}
-
-openwrt_build_toolchain() {
- echo "============================================================================="
- echo "$(date -u) - Building the toolchain."
- echo "============================================================================="
-
- ionice -c 3 make -j $NUM_CPU tools/install
- ionice -c 3 make -j $NUM_CPU toolchain/install
-}
-
-openwrt_build() {
- RUN=$1
- TARGET=$2
-
- OPTIONS="-j $NUM_CPU IGNORE_ERRORS=ym BUILD_LOG=1"
-
- echo "============================================================================="
- echo "$(date -u) - Building OpenWrt ${OPENWRT_VERSION} ($TARGET) - $RUN build run."
- echo "============================================================================="
- ionice -c 3 $MAKE $OPTIONS target/compile
- ionice -c 3 $MAKE $OPTIONS package/cleanup
- ionice -c 3 $MAKE $OPTIONS package/compile || true # don't let some packages fail the whole build
- ionice -c 3 $MAKE $OPTIONS package/install
- ionice -c 3 $MAKE $OPTIONS target/install V=s || true
- ionice -c 3 $MAKE $OPTIONS package/index || true # don't let some packages fail the whole build
-}
-
-openwrt_cleanup() {
- rm build_dir/target-* -rf
- rm staging_dir/target-* -rf
- rm bin/* -rf
- rm logs/* -rf
-}
-
-# TARGET a target including subtarget. E.g. ar71xx_generic
-# CONFIG - a simple basic .config as string. Use \n to seperate lines
-# TYPE - openwrt or lede
-# lede has a different output directory than openwrt
-build_two_times() {
- TYPE=$1
- TARGET=$2
- CONFIG=$3
-
- openwrt_config $CONFIG
- openwrt_build_toolchain
-
- # FIRST BUILD
- export TZ="/usr/share/zoneinfo/Etc/GMT+12"
- MAKE=make
- openwrt_build "first" "$TARGET"
-
- # get banner
- cat $(find build_dir/ -name banner | grep etc/banner|head -1) > $BANNER_HTML
-
- # save results in b1
- [ TYPE = "lede" ] && save_lede_results b1
- [ TYPE = "openwrt" ] && save_openwrt_results b1
-
- # copy logs
- save_openwrt_logs b1
-
- # clean up between builds
- openwrt_cleanup
-
- # SECOND BUILD
- export TZ="/usr/share/zoneinfo/Etc/GMT-14"
- export LANG="fr_CH.UTF-8"
- export LC_ALL="fr_CH.UTF-8"
- export PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path"
- export CAPTURE_ENVIRONMENT="I capture the environment"
- umask 0002
- # use allmost all cores for second build
- NEW_NUM_CPU=$(echo $NUM_CPU-1|bc)
- MAKE="linux64 --uname-2.6 make"
- openwrt_build "second" "$TARGET"
-
- # save results in b2
- [ TYPE = "lede" ] && save_lede_results b2
- [ TYPE = "openwrt" ] && save_openwrt_results b2
-
- # copy logs
- save_openwrt_logs b2
-
- # reset environment to default values again
- export LANG="en_GB.UTF-8"
- unset LC_ALL
- export TZ="/usr/share/zoneinfo/UTC"
- export PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:"
- umask 0022
-
- # clean up again
- openwrt_cleanup
-}
-
#
# main
#
diff --git a/bin/reproducible_openwrt_common.sh b/bin/reproducible_openwrt_common.sh
new file mode 100644
index 0000000..210d6de
--- /dev/null
+++ b/bin/reproducible_openwrt_common.sh
@@ -0,0 +1,194 @@
+#!/bin/bash
+
+# Copyright 2014-2015 Holger Levsen <holger at layer-acht.org>
+# © 2015 Reiner Herrmann <reiner at reiner-h.de>
+# 2016 Alexander Couzens <lynxis at fe80.eu>
+# released under the GPLv=2
+
+cleanup_tmpdirs() {
+ cd
+ # (very simple) check we are deleting the right stuff
+ if [ "${TMPDIR:0:26}" != "/srv/reproducible-results/" ] || [ ${#TMPDIR} -le 26 ] || \
+ [ "${TMPBUILDDIR:0:23}" != "/srv/workspace/chroots/" ] || [ ${#TMPBUILDDIR} -le 23 ] ; then
+ echo "Something very strange with \$TMPDIR=$TMPDIR or \$TMPBUILDDIR=$TMPBUILDDIR, exiting instead of doing cleanup."
+ exit 1
+ fi
+ rm -rf $TMPDIR
+ rm -rf $TMPBUILDDIR
+ rm -f $BANNER_HTML
+}
+
+create_results_dirs() {
+ mkdir -p $BASE/openwrt/dbd
+}
+
+save_openwrt_logs() {
+ local postfix="$1"
+
+ tar cJf "$BASE/openwrt/dbd/logs_${postfix}.tar.xz" logs/
+}
+
+save_lede_results() {
+ RUN=$1
+ cd bin/targets
+ for target in * ; do
+ pushd $target || continue
+ for subtarget in * ; do
+ pushd $subtarget || continue
+
+ # save firmware images
+ mkdir -p $TMPDIR/$RUN/$target/$subtarget/
+ for image in $(find * -name "*.bin" -o -name "*.squashfs") ; do
+ cp -p $image $TMPDIR/$RUN/$target/$subtarget/
+ done
+
+ # save subtarget specific packages
+ if [ -d packages ] ; then
+ pushd packages
+ for package in $(find * -name "*.ipk") ; do
+ mkdir -p $TMPDIR/$RUN/packages/$target/$subtarget/$(dirname $package)
+ cp -p $package $TMPDIR/$RUN/packages/$target/$subtarget/$(dirname $package)/
+ done
+ popd
+ fi
+ done
+ popd
+ done
+
+ # arch is like mips_34kc_dsp
+ popd bin/packages/
+ for arch in * ; do
+ pushd $arch || continue
+ for package in $(find * -name "*.ipk") ; do
+ mkdir -p $TMPDIR/$RUN/packages/$arch/$(dirname $package)
+ cp -p $package $TMPDIR/$RUN/packages/$arch/$(dirname $package)/
+ done
+ popd
+ done
+ pushd
+}
+
+save_openwrt_results() {
+ RUN=$1
+ cd bin
+ for i in * ; do
+ cd $i
+ # save images
+ mkdir -p $TMPDIR/$RUN/$i
+ for j in $(find * -name "*.bin" -o -name "*.squashfs") ; do
+ cp -p $j $TMPDIR/$RUN/$i/
+ done
+ # save packages
+ cd packages
+ for j in $(find * -name "*.ipk") ; do
+ mkdir -p $TMPDIR/$RUN/$i/$(dirname $j)
+ cp -p $j $TMPDIR/$RUN/$i/$(dirname $j)/
+ done
+ cd ../..
+ done
+ cd ..
+}
+
+openwrt_config() {
+ CONFIG=$1
+
+ printf "$CONFIG" > .config
+ printf "CONFIG_ALL=y\n" >> .config
+ printf "CONFIG_CLEAN_IPKG=y\n" >> .config
+ printf "CONFIG_TARGET_ROOTFS_TARGZ=y\n" >> .config
+ make defconfig
+}
+
+openwrt_build_toolchain() {
+ echo "============================================================================="
+ echo "$(date -u) - Building the toolchain."
+ echo "============================================================================="
+
+ ionice -c 3 make -j $NUM_CPU tools/install
+ ionice -c 3 make -j $NUM_CPU toolchain/install
+}
+
+openwrt_build() {
+ RUN=$1
+ TARGET=$2
+
+ OPTIONS="-j $NUM_CPU IGNORE_ERRORS=ym BUILD_LOG=1"
+
+ echo "============================================================================="
+ echo "$(date -u) - Building OpenWrt ${OPENWRT_VERSION} ($TARGET) - $RUN build run."
+ echo "============================================================================="
+ ionice -c 3 $MAKE $OPTIONS target/compile
+ ionice -c 3 $MAKE $OPTIONS package/cleanup
+ ionice -c 3 $MAKE $OPTIONS package/compile || true # don't let some packages fail the whole build
+ ionice -c 3 $MAKE $OPTIONS package/install
+ ionice -c 3 $MAKE $OPTIONS target/install V=s || true
+ ionice -c 3 $MAKE $OPTIONS package/index || true # don't let some packages fail the whole build
+}
+
+openwrt_cleanup() {
+ rm build_dir/target-* -rf
+ rm staging_dir/target-* -rf
+ rm bin/* -rf
+ rm logs/* -rf
+}
+
+# TARGET a target including subtarget. E.g. ar71xx_generic
+# CONFIG - a simple basic .config as string. Use \n to seperate lines
+# TYPE - openwrt or lede
+# lede has a different output directory than openwrt
+build_two_times() {
+ TYPE=$1
+ TARGET=$2
+ CONFIG=$3
+
+ openwrt_config $CONFIG
+ openwrt_build_toolchain
+
+ # FIRST BUILD
+ export TZ="/usr/share/zoneinfo/Etc/GMT+12"
+ MAKE=make
+ openwrt_build "first" "$TARGET"
+
+ # get banner
+ cat $(find build_dir/ -name banner | grep etc/banner|head -1) > $BANNER_HTML
+
+ # save results in b1
+ [ TYPE = "lede" ] && save_lede_results b1
+ [ TYPE = "openwrt" ] && save_openwrt_results b1
+
+ # copy logs
+ save_openwrt_logs b1
+
+ # clean up between builds
+ openwrt_cleanup
+
+ # SECOND BUILD
+ export TZ="/usr/share/zoneinfo/Etc/GMT-14"
+ export LANG="fr_CH.UTF-8"
+ export LC_ALL="fr_CH.UTF-8"
+ export PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path"
+ export CAPTURE_ENVIRONMENT="I capture the environment"
+ umask 0002
+ # use allmost all cores for second build
+ NEW_NUM_CPU=$(echo $NUM_CPU-1|bc)
+ MAKE="linux64 --uname-2.6 make"
+ openwrt_build "second" "$TARGET"
+
+ # save results in b2
+ [ TYPE = "lede" ] && save_lede_results b2
+ [ TYPE = "openwrt" ] && save_openwrt_results b2
+
+ # copy logs
+ save_openwrt_logs b2
+
+ # reset environment to default values again
+ export LANG="en_GB.UTF-8"
+ unset LC_ALL
+ export TZ="/usr/share/zoneinfo/UTC"
+ export PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:"
+ umask 0022
+
+ # clean up again
+ openwrt_cleanup
+}
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git
More information about the Qa-jenkins-scm
mailing list