From 5f34b312d3bf305a0f1d5b388270de0a30ae3146 Mon Sep 17 00:00:00 2001 From: Ludovic Pouzenc Date: Mon, 5 Jun 2017 13:26:39 +0200 Subject: Hotfix for 9a1fd3e buildroot that refers to unavailable logd package Was applied by hand on dev. Now automated on both. --- build-openwrt-dev.sh | 14 ++++++++++ build-openwrt.sh | 73 ++++++++++++++++++++++++++-------------------------- 2 files changed, 51 insertions(+), 36 deletions(-) diff --git a/build-openwrt-dev.sh b/build-openwrt-dev.sh index 734f59e..5977122 100755 --- a/build-openwrt-dev.sh +++ b/build-openwrt-dev.sh @@ -99,6 +99,20 @@ if [ ! -f "$BUILD_DIR/Makefile" ]; then wget -O "$CACHE_DIR/$ORIG_TARBALL" "$ORIG_URL" fi tar -x -C "$BUILD_DIR/" --strip-components=1 -f "$CACHE_DIR/$ORIG_TARBALL" + # Hotfix about "logd" package not availble on chaos-calmer + patch -d "$BUILD_DIR/" -p1 <<"EOT" +--- a/include/target.mk 2017-04-01 22:00:23.000000000 +0200 ++++ b/include/target.mk 2017-04-03 20:01:23.620028730 +0200 +@@ -12,7 +12,7 @@ + DEVICE_TYPE?=router + + # Default packages - the really basic set +-DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd fstools logd ++DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd fstools + # For nas targets + DEFAULT_PACKAGES.nas:=block-mount fdisk lsblk mdadm + # For router targets +EOT fi cd "$BUILD_DIR/" || exit 5 diff --git a/build-openwrt.sh b/build-openwrt.sh index 43acdbf..5977122 100755 --- a/build-openwrt.sh +++ b/build-openwrt.sh @@ -22,12 +22,10 @@ echo -n "$0 - " ; date # Directories and source file URL BUILD_DIR=${BUILD_DIR:-./build} CACHE_DIR=${CACHE_DIR:-.} -ORIG_TARBALL=OpenWrt-ImageBuilder-15.05.1-ar71xx-generic.Linux-x86_64.tar.bz2 -ORIG_URL=http://downloads.openwrt.org/chaos_calmer/15.05.1/ar71xx/generic/$ORIG_TARBALL +ORIG_TARBALL=OpenWrt-ImageBuilder-9a1fd3e-ar71xx-generic.Linux-x86_64.tar.bz2 +ORIG_URL=http://stg2.chd.sx/openwrt/chaos_calmer/15.05.1/ar71xx/generic/$ORIG_TARBALL PACKAGES="luci luci-mod-admin-full ip" # Base packages PACKAGES="$PACKAGES luci-i18n-base-en luci-i18n-firewall-en luci-i18n-base-fr luci-i18n-firewall-fr" # internationnalisation -PACKAGES="$PACKAGES miniupnpd luci-app-upnp luci-i18n-upnp-fr" # Extra packages -PACKAGES="$PACKAGES kmod-ledtrig-default-on kmod-ledtrig-netdev kmod-ledtrig-timer kmod-ledtrig-usbdev kmod-leds-gpio" # Additionnal kernel modules PACKAGES="$PACKAGES -kmod-ppp -kmod-pppoe -kmod-pppox" # Unusefull kernel modules PACKAGES="$PACKAGES -luci-proto-ppp -ppp -ppp-mod-pppoe -odhcp6c" # Unusefull packages @@ -82,6 +80,7 @@ esac wanip6gw=fe80::31 +# Sumary for interactive user cat < extra_files/etc/dropbear/authorized_keys < extra_files/etc/shadow < extra_files/etc/config/upnpd < extra_files/etc/hotplug.d/button/01onoff <<"EOF" #!/bin/sh @@ -401,15 +390,27 @@ cat > extra_files/etc/hotplug.d/button/01onoff <<"EOF" } EOF +cat > extra_files/etc/banner <<"EOF" + _______ ________ __ + | |.-----.-----.-----.| | | |.----.| |_ + | - || _ | -__| || | | || _|| _| + |_______|| __|_____|__|__||________||__| |____| + |__| W I R E L E S S F R E E D O M + ----------------------------------------------------- + CHAOS CALMER (15.05.1, 9a1fd3e 2017-03-09) + ----------------------------------------------------- + * 1 1/2 oz Gin Shake with a glassful + * 1/4 oz Triple Sec of broken ice and pour + * 3/4 oz Lime Juice unstrained into a goblet. + * 1 1/2 oz Orange Juice + * 1 tsp. Grenadine Syrup + ----------------------------------------------------- +EOF + ####################### # Build Openwrt image # ####################### -# Bug fix for RC3 (make clean forget things) -#if [ -d $BUILD_DIR/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/tmp ] -#then rm -r $BUILD_DIR/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/tmp -#fi - make clean make image PROFILE=$profile PACKAGES="$PACKAGES" FILES="extra_files/" res=$? @@ -417,7 +418,7 @@ res=$? echo if [ $res -eq 0 ] then echo "Image ready: " - ls -la bin/ar71xx/openwrt-*-ar71xx-generic-tl-*-v[49]-squashfs-* + ls -la bin/ar71xx/openwrt*ar71xx-generic-tl-*-v*-squashfs-* echo else echo "Something went wrong, sorry" fi -- cgit v1.1