summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Pouzenc <ludovic@pouzenc.fr>2017-06-05 13:26:39 +0200
committerLudovic Pouzenc <ludovic@pouzenc.fr>2017-06-05 13:26:39 +0200
commit5f34b312d3bf305a0f1d5b388270de0a30ae3146 (patch)
treedd445c6aa5ff6a62a12f42ef11bbd0ed01722528
parent6074c1f152347eaea478111a56fe1746c53c5dbb (diff)
downloadchd_openwrt-5f34b312d3bf305a0f1d5b388270de0a30ae3146.zip
chd_openwrt-5f34b312d3bf305a0f1d5b388270de0a30ae3146.tar.gz
chd_openwrt-5f34b312d3bf305a0f1d5b388270de0a30ae3146.tar.bz2
Hotfix for 9a1fd3e buildroot that refers to unavailable logd package
Was applied by hand on dev. Now automated on both.
-rwxr-xr-xbuild-openwrt-dev.sh14
-rwxr-xr-xbuild-openwrt.sh73
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 <<EOF
wanip4addr: $wanip4addr
wanip6addr: $wanip6addr
@@ -100,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
@@ -132,6 +145,8 @@ cat > extra_files/etc/dropbear/authorized_keys <<EOF
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCuRKy/uRhwFvR3JrCp2NKY0HUPl0m7INUjY9wemmEGA6pSH/9zb+MLX9ZfuDVo6gkMI2YZzdpwAZ7KE2tajDXHHl+KiycY3lcQizgQt3usxf7Eqz3pTWtZBOjrHs3hRloPugg8KXA8Sxko03f68v8lfUw+Kj4LHmnnozJc8Hxde3GjkFbyL9c9Z5rSYG82H217RWaSDnjYso9wyBZYkjTe6vu88fWls3+ZL8p8NdrgqMFO7C+zV38Mgk/G3PkC9SYdobgy58Cm/06jehWonuafZ6bXTH1J3qjogbcGfewNx4H4E7Lf1nl6UTdbAC24tZu3c/UXZQzND+yRRK1r0zen lpouzenc@ttn
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDpqlz2pyiBoGnC7FgnyXrb012hnnLFL0I0RColS/fLzJT4VL8t3/hPFy/Jbl4tX28Yw5G+Mc0WFzZ+KS1ebmYqBcXi2OGNm65HGsEMGUa+67g8PP0t+2OPRN05gFR4Cf4HFro3FdDf/R4mZOf5+Z1Z8fAyIhQ34x/0sl+hnt/nqbOdNlOSqzqyQmmKtzUKSh2CiffajAW/sVfD3HAG1CCiy+Z88df1v7kQ/HdFhFqtjcHrWLO/zgQBOCf3SMrZpead1B13DXCQLMeI98i+VIRB+K6c71FMIGU1Ohp5/FRWtHJ+3nFqRsKOWbBI0SmeMnz9wXkG7FQ2CaDUvg7vB0AZ cyril@cyril-master
ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAtfZ7UcydNGf5vpLgfvJRHs6Q08qKP1fIr8aXALg0+/pAlF5FEKMqwERpJ+B8YTmJl0MrrznPLPOUoaYqgJl5aqFww0zDNpbbtW6qDoQE85VRjEmchfbLae8s9q6eWW+CfNh0+7bwBPNTaPVq/FKfge4aR0GwA+ggzS9kPoLRPBM= nicolas@selenimh
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDCnkhcQ/nU9Hg89N7PHERLzEhZ68xnOkA4Vt2Tr6PFjsnOVECAaRc2dSFyB4Y7Q+R15UtXcHVVGXI99dJvI/sYS6x1WB86c61ZvcozEglJRMgyaoDD19kPHa8tMeARH9PKCII1amLcOov7/VjGUl9KzJl0HQHp5bFSqsiKvAlu60RvYY7+ktI8qKpZ1UV79K6fNyM792lAFpHT1hk8zzkUDw55VgEd2q4idmaTEbNHjHMsBV0W2zRN+/Ww9jlqQzTtnHkrbI2qw37y9jjUYrks0WKekeazN2E2t7XkyAzrJIKEG3atXgQMF2q2NN01MltpYqs4lzXXuOun8IqDiuSf samylaptop@samylaptop
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCukL8Bb4dOJik6Vu/GOw7s7fyOLQXTK2O4jgUY/D/x/o5Gn/fmmDYsZtvPNhjpJ4oS8GFSBvUart0iKMFomiBeonbaR93pS5utcF/ySAOrc+1PMxgDMuq0r5KTt0tWG/XCFzFXZwF+Rhe6KsHAOIStXRh4TYhY60pJD2RQLCp4GHETWDw7E0Rqi7ccDWYS/Y1S0/hQTLdzY07CDZinU+w/J6fRzc4OThE+u01JlkCE2tQXnq0zU3SpMuJb0bl66QfP4VSh+xFjtd7LpHpWM5ZNEml+oZkBX6mloqkbOx8Nt1+ChtS7S0AwpEEFbN5xrhQZNFYtADnJviQArr3n4ZQj0Erfl5Eny6VZ/suN0jW/ZRNt/3lBUIkggiGPRIYTDsr2bVBapofriXSgUgDOZ4yBcqoKFN2PcLVVqNNs/38zmMPQHc88rftagsge6upfLc7VqjCnTT88zfV7q7q24idio3xtX3ajwtQxq4k3m3aM/hQobjY0SGGjIs1KPhBLuL7eNJKypqLCGJVuqOULoiQnbFE4lVjasIhQE/MhPGBDIR8MimMTsjGf/7n75sLcGD6M/XE27FYwQBLtNTyBVjZ2ntoAT7yRmZE/xuFWkmlUusPce9kPlX83Qx1uhpPFd3R5cBn31rzQxINKVXT1c3dX68aH+IbS5tBU19PpdNuRtw== julien@nuc01
EOF
cat > extra_files/etc/shadow <<EOF
@@ -364,32 +379,6 @@ config include
option path '/etc/firewall.user'
EOF
-cat > extra_files/etc/config/upnpd <<EOF
-config upnpd 'config'
- option download '1024'
- option upload '512'
- option internal_iface 'lan'
- option port '5000'
- option upnp_lease_file '/var/upnp.leases'
- option uuid 'acae4394-2186-4d96-92d1-b2c8d0819f37'
- option enable_upnp '0'
- option enable_natpmp '0'
-
-config perm_rule
- option action 'allow'
- option ext_ports '1024-65535'
- option int_addr '0.0.0.0/0'
- option int_ports '1024-65535'
- option comment 'Allow high ports'
-
-config perm_rule
- option action 'deny'
- option ext_ports '0-65535'
- option int_addr '0.0.0.0/0'
- option int_ports '0-65535'
- option comment 'Default deny'
-EOF
-
cat > 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