update to openwrt 18.06.1

tested with ./build.sh ar71xx generic tl-wr1043nd-v1

README.md

@@ -17,18 +17,20 @@ So that e.g. customers can buy a router on their own, flash our custom
 firmware, plug in a pendrive, and manage their SIP (telephony) node
 from our webapp.
 
+I've extracted the generic parts from the above mentioned auto-provision
+project because I thought it's useful enough for making it public.
+
 # How
 ### Building
 
-To build issue the following command: `./build.sh architecture variant device-profile`, e.g.:
-* `./build.sh ar71xx generic TLWDR4300`
-* `./build.sh ramips mt7621 ZBT-WG3526`
+To build it, issue the following command: `./build.sh architecture variant device-profile`, e.g.:
+* `./build.sh ar71xx generic tl-wr1043nd-v2`
 
-Results will be under `build/OpenWrt-ImageBuilder-${architecture}_${variant}-for-linux-x86_64/bin/`.
+Results will be under `build/openwrt-imagebuilder-${release}-${architecture}-${variant}.Linux-x86_64/bin/`.
 
-To see a list of available targets, run this in the ImageBuilder dir: `make info`.
+To see a list of available targets, run `make info` in the ImageBuilder dir.
 
-If you want to change which OpenWRT version is used, then edit the relevant variables in `build.sh` (`RELEASE`, and `RELEASE_NAME`).
+If you want to change which OpenWRT version is used, then edit the relevant variable(s) in `build.sh`.
 
 ### Setup stages
 
@@ -37,7 +39,7 @@ sources for details: [autoprovision-functions.sh](image-extras/common/root/autop
 
 #### Stage 1: setup extroot
 
-At the first boot after flashing the firmware the autoprovision script will
+When the custom firmware first boots, the autoprovision script will
 wait for anything (!) in `/dev/sda` to show up (that is >= 512M), then erase
 it and set up a `swap`, an `extroot`, and a `data`filesystem (for the remaining
 space), and then reboot.
@@ -46,7 +48,7 @@ space), and then reboot.
 
 Once it booted into the new extroot, it will continuously attempt to install
 some OpenWRT packages until an internet connection is set up on the router
-(either by using ssh or LuCI if you could fit it into the firmware).
+(either by using ssh or the web UI (LuCI)).
 
 ### Login
 
@@ -70,24 +72,20 @@ probably want to customize this script here and there; search for
 
 Most importantly, **set up a password and maybe an ssh key**.
 
-I've extracted this from a project of mine where OpenWRT nodes auto-provision
-themselves in 3 stages (stage 3 was a Python script for an app-level sync feature),
-but I thought it's useful enough for making it public.
-
 At the time of writing it only supports a few `ar71xx` routers out of the box,
 but it's easy to extend it.
 
 ## Tested with
 
-[OpenWRT Chaos Calmer 15.05 RC1](https://downloads.openwrt.org/chaos_calmer/15.05-rc1/)
-on a TP-Link WDR4300.
+[OpenWRT 17.01.4](https://downloads.openwrt.org/releases/)
+on a TP-Link WR-1043nd-v2.
 
 # Troubleshooting
 
 ## Which file should I flash?
 
 You should consult the [OpenWRT documentation](https://wiki.openwrt.org/doc/howto/user.beginner).
-The produced firmware files should be somewhere around ```build/OpenWrt-ImageBuilder-15.05-ar71xx-generic.Linux-x86_64/bin/ar71xx```.
+The produced firmware files should be somewhere around ```build/openwrt-imagebuilder-17.01.4-ar71xx-generic.Linux-x86_64/bin/ar71xx```.
 
 In short:
 
@@ -97,7 +95,7 @@ In short:
 
 * You must carefully pick the proper firmware file for your **hardware version**! I advise you
   to look up the wiki page for your hardware on the [OpenWRT wiki](https://wiki.openwrt.org),
-  because most of them have a table of the released hardawre versions with comments on their
+  because most of them have a table of the released hardware versions with comments on their
   status (sometimes new hardware revisions are only supported by the latest OpenWRT, which is
   not released yet).
 

build.sh

@@ -25,27 +25,21 @@ BUILD=`absolutize $BUILD`
 ###
 ### chose a release
 ###
-RELEASE_NAME="chaos_calmer"
-RELEASE="15.05"
+RELEASE="18.06.1"
 
-#RELEASE_NAME="snapshots"
-#RELEASE="trunk"
-
-if [ $RELEASE = "trunk" ]; then
-    IMGBUILDER_NAME="OpenWrt-ImageBuilder-${TARGET_ARCHITECTURE}-${TARGET_VARIANT}.Linux-x86_64"
-else
-    IMGBUILDER_NAME="OpenWrt-ImageBuilder-${RELEASE}-${TARGET_ARCHITECTURE}-${TARGET_VARIANT}.Linux-x86_64"
-fi
+IMGBUILDER_NAME="openwrt-imagebuilder-${RELEASE}-${TARGET_ARCHITECTURE}-${TARGET_VARIANT}.Linux-x86_64"
 IMGBUILDER_DIR="${BUILD}/${IMGBUILDER_NAME}"
-IMGBUILDER_ARCHIVE="${IMGBUILDER_NAME}.tar.bz2"
+IMGBUILDER_ARCHIVE="${IMGBUILDER_NAME}.tar.xz"
 
-IMGTEMPDIR="${BUILD}/openwrt-build-image-extras"
-IMGBUILDERURL="https://downloads.openwrt.org/${RELEASE_NAME}/${RELEASE}/${TARGET_ARCHITECTURE}/${TARGET_VARIANT}/${IMGBUILDER_ARCHIVE}"
+IMGTEMPDIR="${BUILD}/image-extras"
+IMGBUILDERURL="https://downloads.openwrt.org/releases/${RELEASE}/targets/${TARGET_ARCHITECTURE}/${TARGET_VARIANT}/${IMGBUILDER_ARCHIVE}"
 
 if [ -z ${TARGET_DEVICE} ]; then
     echo "Usage: $0 architecture variant device-profile"
-    echo " e.g.: $0 ar71xx generic TLWDR4300"
-    echo "       $0 ramips mt7621 ZBT-WG3526"
+    echo " e.g.: $0 ar71xx generic tl-wr1043nd-v2"
+    echo "       $0 ramips mt7621 zbt-wg3526"
+    echo "       $0 bcm53xx generic dlink-dir-885l"
+    echo "       (this last one will not work without editing build.sh, details: https://github.com/attila-lendvai/openwrt-auto-extroot/pull/15#issuecomment-405847440)"
     echo " to get a list of supported devices issue a 'make info' in the OpenWRT image builder directory:"
     echo "   '${IMGBUILDER_DIR}'"
     kill -INT $$
@@ -79,8 +73,8 @@ fi
 if [ ! -e ${IMGBUILDER_DIR} ]; then
     pushd ${BUILD}
     # --no-check-certificate if needed
-    wget  --continue ${IMGBUILDERURL}
-    tar jvxf ${IMGBUILDER_ARCHIVE}
+    wget --continue ${IMGBUILDERURL}
+    xz -d <${IMGBUILDER_ARCHIVE} | tar vx
     popd
 fi
 
@@ -88,8 +82,8 @@ pushd ${IMGBUILDER_DIR}
 
 make image PROFILE=${TARGET_DEVICE} PACKAGES="${PREINSTALLED_PACKAGES}" FILES=${IMGTEMPDIR}
 
-pushd bin/${TARGET_ARCHITECTURE}/
-ln -s ../../packages .
+pushd bin/targets/${TARGET_ARCHITECTURE}/
+ln -s ../../../packages .
 popd
 
 popd