build: use git module

Author: AxelDum

.gitignore

@@ -1,3 +1 @@
 sdk
-source
-feeds

.gitmodules

@@ -0,0 +1,20 @@
+[submodule "openwrt"]
+	path = openwrt
+	url = https://github.com/ovh/overthebox-lede
+	branch = otb-mptcp-18.10.05
+[submodule "feeds/packages"]
+	path = feeds/packages
+	url = https://github.com/openwrt/packages
+	branch = openwrt-18.06
+[submodule "feeds/routing"]
+	path = feeds/routing
+	url = https://github.com/openwrt-routing/packages
+	branch = openwrt-18.06
+[submodule "feeds/luci"]
+	path = feeds/luci
+	url = https://github.com/openwrt/luci
+	branch = for-15.05
+[submodule "feeds/overthebox"]
+	path = feeds/overthebox
+	url = ../overthebox-feeds
+	branch = .

README.md

@@ -55,17 +55,17 @@ cd overthebox
 ```
 
 The script `build.sh` accepts all `make` arguments (like `-j`).
-When finished, files are located in the directory `source/bin`.
+When finished, files are located in the directory `openwrt/bin`.
 
 ### Custom arch build
 
 By default the build script will create the packages for the `x86_64` architecture.
-You can specify a custom build target by adding a `OTB_TARGET` environment variable to the build and the corresponding `config/$OTB_TARGET` file.
+You can specify a custom build target by adding a `OTB_ARCH` environment variable to the build and the corresponding `config/$OTB_ARCH` file.
 
 To build the project for the raspberry pi 3:
 
 ```sh
-OTB_TARGET="rpi3" ./build.sh
+OTB_ARCH="rpi3" ./build.sh
 ```
 
 ## Create a recovery key

build.sh

@@ -5,83 +5,61 @@ set -e
 umask 0022
 unset GREP_OPTIONS SED
 
-_get_repo() (
-	mkdir -p "$1"
-	cd "$1"
-	[ -d .git ] || git init
-	if git remote get-url origin >/dev/null 2>/dev/null; then
-		git remote set-url origin "$2"
-	else
-		git remote add origin "$2"
-	fi
-	git fetch origin
-	git fetch origin --tags
-	git checkout "origin/$3" -B "build" 2>/dev/null || git checkout "$3" -B "build"
-)
-
-OTB_HOST=${OTB_HOST:-$(curl -sS ipaddr.ovh)}
-OTB_PORT=${OTB_PORT:-8000}
-OTB_REPO=${OTB_REPO:-http://$OTB_HOST:$OTB_PORT/$OTB_PATH}
-
-OTB_TARGET=${OTB_TARGET:-x86_64}
+OTB_REPO=${OTB_REPO:-LOCAL}
+OTB_ARCH=${OTB_ARCH:-x86_64}
 OTB_CONFIG=${OTB_CONFIG:-net-full nice-bb usb-full legacy}
 OTB_PKGS=${OTB_PKGS:-vim-full netcat htop iputils-ping bmon bwm-ng screen mtr ss strace tcpdump-mini ethtool sysstat pciutils mini_snmpd dmesg}
 
-OTB_FEED_URL="${OTB_FEED_URL:-https://github.com/ovh/overthebox-feeds}"
-OTB_FEED_SRC="${OTB_FEED_SRC:-v0.6}"
-
-for i in $OTB_TARGET $OTB_CONFIG; do
+for i in $OTB_ARCH $OTB_CONFIG; do
 	if [ ! -f "config/$i" ]; then
 		echo "Config $i not found !"
 		exit 1
 	fi
 done
 
-OTB_FEED_BRANCH="openwrt-18.06@{2018-10-05 00:00:00}"
+# Fetch submodule
+git submodule update --init --recursive
 
-_get_repo source https://github.com/ovh/overthebox-lede "otb-mptcp-18.10.05"
-_get_repo feeds/packages https://github.com/openwrt/packages "$OTB_FEED_BRANCH"
-_get_repo feeds/luci https://github.com/openwrt/luci "for-15.05"
-_get_repo feeds/routing https://github.com/openwrt-routing/packages "$OTB_FEED_BRANCH"
+# Get Version
+OTB_VERSION=${OTB_VERSION:=$(git describe --tag --always)}
+OTB_FEEDS_VERSION=${OTB_FEEDS_VERSION:=$(git -C feeds/overthebox describe --tag --always)}
 
-if [ -z "$OTB_FEED" ]; then
-	OTB_FEED=feeds/overthebox
-	_get_repo "$OTB_FEED" "$OTB_FEED_URL" "$OTB_FEED_SRC"
-fi
-
-rm -rf source/bin source/files source/tmp
-cp -rf root source/files
+rm -rf openwrt/bin openwrt/files openwrt/tmp
+cp -rf root openwrt/files
 
-cat >> source/files/etc/banner <<EOF
+cat >> openwrt/files/etc/banner <<EOF
 -----------------------------------------------------
- VERSION:     $(git describe --tag --always)
+ VERSION:     $OTB_VERSION - $OTB_FEEDS_VERSION
 
  BUILD REPO:  $(git config --get remote.origin.url)
  BUILD DATE:  $(date -u)
 -----------------------------------------------------
 EOF
 
-cat > source/feeds.conf <<EOF
+cat > openwrt/feeds.conf <<EOF
 src-link packages $(readlink -f feeds/packages)
 src-link luci $(readlink -f feeds/luci)
 src-link routing $(readlink -f feeds/routing)
-src-link overthebox $(readlink -f "$OTB_FEED")
+src-link overthebox $(readlink -f feeds/overthebox)
 EOF
 
-cat > source/.config <<EOF
-$(for i in $OTB_TARGET $OTB_CONFIG; do cat "config/$i"; done)
+cat > openwrt/.config <<EOF
+$(for i in $OTB_ARCH $OTB_CONFIG; do cat "config/$i"; done)
 CONFIG_IMAGEOPT=y
 CONFIG_VERSIONOPT=y
 CONFIG_VERSION_DIST="OverTheBox"
 CONFIG_VERSION_REPO="$OTB_REPO"
-CONFIG_VERSION_NUMBER="$(git describe --tag --always)"
-CONFIG_VERSION_CODE="$(git -C "$OTB_FEED" describe --tag --always)"
+CONFIG_VERSION_NUMBER="$OTB_VERSION"
+CONFIG_VERSION_CODE="$OTB_FEEDS_VERSION"
+CONFIG_VERSION_HOME_URL="https://github.com/ovh/overthebox"
+CONFIG_VERSION_BUG_URL="https://github.com/ovh/overthebox/issues"
+CONFIG_VERSION_SUPPORT_URL="https://community.ovh.com/c/telecom/overthebox"
 $(for i in otb $OTB_PKGS; do echo "CONFIG_PACKAGE_$i=y"; done)
 EOF
 
-echo "Building for the target $OTB_TARGET"
+echo "Building for arch $OTB_ARCH"
 
-cd source
+cd openwrt
 
 cp .config .config.keep
 scripts/feeds clean
@@ -92,4 +70,7 @@ scripts/feeds install -d y $OTB_PKGS
 cp .config.keep .config
 
 make defconfig
-make "$@"
+if ! make "$@"; then
+    make "$@" -j1 V=s 2>&1 | tee error.log
+    exit 1
+fi

feeds/luci

@@ -2,7 +2,7 @@
 
 key=${1:-key-build}
 
-[ -d source/bin ] && [ -f "$key" ] && \
-	find source/bin \
+[ -d openwrt/bin ] && [ -f "$key" ] && \
+	find openwrt/bin \
 	\( -name '*.img.gz' -or -name 'Packages' \) \
-	-exec source/staging_dir/host/bin/usign -S -m {} -s "$key" \;
+	-exec openwrt/staging_dir/host/bin/usign -S -m {} -s "$key" \;