update camkrebs

15 files changed, 38 insertions, 7 deletions

diff --git a/minikrebs/prepare b/minikrebs/prepare
index 320e4516..610c1299 100755
--- a/minikrebs/prepare
+++ b/minikrebs/prepare
@@ -7,15 +7,15 @@ if [ x"${1:-}" == x ];then
     echo "usage: $0 PROFILE"
     echo
     echo "Available Profiles:"
-    ls -1 profiles/ | grep -v '^init$' | while read profile; do
+    ls -1 profiles/ |grep -v '^README' | grep -v '^init$' | while read profile; do
         echo "    $profile"
     done
     exit 1
 fi
 PROFILE=$1
 if [ ! -e builder/Makefile ]; then
-    wget -O- $IMAGEBUILDER_URL | tar xj -C builder OpenWrt-ImageBuilder-ar71xx_generic-for-linux-i486
-    mv OpenWrt-ImageBuilder-ar71xx_generic-for-linux-i486 builder
+    wget -O- $IMAGEBUILDER_URL | tar xj OpenWrt-ImageBuilder-ar71xx_generic-for-linux-i486
+    mv -f OpenWrt-ImageBuilder-ar71xx_generic-for-linux-i486 builder
     echo "Builder successfully downloaded"
 else
     echo "Builder already installed, skipping download"
@@ -28,8 +28,10 @@ echo
 echo "copying profile:"
 find  profiles/$PROFILE -mindepth 1 -maxdepth 1| while read file; do
     echo "  $file -> builder/$(basename $file)"
-    #rm -rf builder/$file
-    cp -r --remove-destination $file builder/
+    rm -rf builder/$(basename $file)
+    cp -r $file builder/
 done
+
 echo
+echo $PROFILE > builder/current_profile
 echo 'now run `builder/init`'
diff --git a/minikrebs/profiles/camkrebs_quickcam/custom_make b/minikrebs/profiles/camkrebs_quickcam/custom_make
new file mode 100755
index 00000000..a01dba54
--- /dev/null
+++ b/minikrebs/profiles/camkrebs_quickcam/custom_make
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+make image PROFILE=TLWR703 PACKAGES="tinc ip kmod-ipv6 radvd kmod-fs-ext4 wireless-tools kmod-usb-core kmod-usb2  kmod-video-gspca-stv06xx mjpg-streamer -kmod-ppp -kmod-pppoe -kmod-pppox -ppp -ppp-mod-pppoe -dnsmasq" FILES=customfiles/
diff --git a/minikrebs/profiles/camkrebs/customfiles/etc/config/mjpg-streamer b/minikrebs/profiles/camkrebs_quickcam/customfiles/etc/config/mjpg-streamer
index 4213b0b2..7417837e 100644
--- a/minikrebs/profiles/camkrebs/customfiles/etc/config/mjpg-streamer
+++ b/minikrebs/profiles/camkrebs_quickcam/customfiles/etc/config/mjpg-streamer
@@ -1,7 +1,7 @@
 config mjpg-streamer core
         option enabled          "1"
         option device           "/dev/video0"
-        option resolution       "1280x1024"
-        option fps              "15"
+        option resolution       "640x480"
+        option fps              "25"
         option www              "/www/webcam"
         option port             "80"
diff --git a/minikrebs/profiles/camkrebs/customfiles/etc/config/network b/minikrebs/profiles/camkrebs_quickcam/customfiles/etc/config/network
index c459c4e0..c459c4e0 100644
--- a/minikrebs/profiles/camkrebs/customfiles/etc/config/network
+++ b/minikrebs/profiles/camkrebs_quickcam/customfiles/etc/config/network
diff --git a/minikrebs/profiles/camkrebs/customfiles/etc/dropbear/authorized_keys b/minikrebs/profiles/camkrebs_quickcam/customfiles/etc/dropbear/authorized_keys
index 9c87fc52..9c87fc52 120000
--- a/minikrebs/profiles/camkrebs/customfiles/etc/dropbear/authorized_keys
+++ b/minikrebs/profiles/camkrebs_quickcam/customfiles/etc/dropbear/authorized_keys
diff --git a/minikrebs/profiles/camkrebs_quickcam/customfiles/etc/rc.d/S91mjpg-streamer b/minikrebs/profiles/camkrebs_quickcam/customfiles/etc/rc.d/S91mjpg-streamer
new file mode 120000
index 00000000..11b1e90d
--- /dev/null
+++ b/minikrebs/profiles/camkrebs_quickcam/customfiles/etc/rc.d/S91mjpg-streamer
@@ -0,0 +1 @@
+../init.d/mjpg-streamer
\ No newline at end of file
diff --git a/minikrebs/profiles/camkrebs/customfiles/etc/shadow b/minikrebs/profiles/camkrebs_quickcam/customfiles/etc/shadow
index 251abaf5..251abaf5 100644
--- a/minikrebs/profiles/camkrebs/customfiles/etc/shadow
+++ b/minikrebs/profiles/camkrebs_quickcam/customfiles/etc/shadow
diff --git a/minikrebs/profiles/camkrebs_quickcam/doc/README.md b/minikrebs/profiles/camkrebs_quickcam/doc/README.md
new file mode 100644
index 00000000..5b787737
--- /dev/null
+++ b/minikrebs/profiles/camkrebs_quickcam/doc/README.md
@@ -0,0 +1,2 @@
+# Documentation
+Firmware for krebs with Logitech QuickCam Messenger attached.
diff --git a/minikrebs/profiles/camkrebs/custom_make b/minikrebs/profiles/camkrebs_uvc/custom_make
index 752a7bfe..752a7bfe 100755
--- a/minikrebs/profiles/camkrebs/custom_make
+++ b/minikrebs/profiles/camkrebs_uvc/custom_make
diff --git a/minikrebs/profiles/camkrebs_uvc/customfiles/etc/config/mjpg-streamer b/minikrebs/profiles/camkrebs_uvc/customfiles/etc/config/mjpg-streamer
new file mode 100644
index 00000000..298b06fe
--- /dev/null
+++ b/minikrebs/profiles/camkrebs_uvc/customfiles/etc/config/mjpg-streamer
@@ -0,0 +1,7 @@
+config mjpg-streamer core
+        option enabled          "1"
+        option device           "/dev/video0"
+        option resolution       "1280x720"
+        option fps              "25"
+        option www              "/www/webcam"
+        option port             "80"
diff --git a/minikrebs/profiles/camkrebs_uvc/customfiles/etc/config/network b/minikrebs/profiles/camkrebs_uvc/customfiles/etc/config/network
new file mode 100644
index 00000000..c459c4e0
--- /dev/null
+++ b/minikrebs/profiles/camkrebs_uvc/customfiles/etc/config/network
@@ -0,0 +1,9 @@
+config interface 'loopback'
+        option ifname 'lo'
+        option proto 'static'
+        option ipaddr '127.0.0.1'
+        option netmask '255.0.0.0'
+
+config interface 'lan'
+        option ifname 'eth0'
+        option proto 'dhcp'
diff --git a/minikrebs/profiles/camkrebs_uvc/customfiles/etc/dropbear/authorized_keys b/minikrebs/profiles/camkrebs_uvc/customfiles/etc/dropbear/authorized_keys
new file mode 120000
index 00000000..9c87fc52
--- /dev/null
+++ b/minikrebs/profiles/camkrebs_uvc/customfiles/etc/dropbear/authorized_keys
@@ -0,0 +1 @@
+/root/.ssh/authorized_keys
\ No newline at end of file
diff --git a/minikrebs/profiles/camkrebs_uvc/customfiles/etc/rc.d/S91mjpg-streamer b/minikrebs/profiles/camkrebs_uvc/customfiles/etc/rc.d/S91mjpg-streamer
new file mode 120000
index 00000000..11b1e90d
--- /dev/null
+++ b/minikrebs/profiles/camkrebs_uvc/customfiles/etc/rc.d/S91mjpg-streamer
@@ -0,0 +1 @@
+../init.d/mjpg-streamer
\ No newline at end of file
diff --git a/minikrebs/profiles/camkrebs/customfiles/etc/rc.local b/minikrebs/profiles/camkrebs_uvc/customfiles/etc/rc.local
index 3e91b57c..3e91b57c 100644
--- a/minikrebs/profiles/camkrebs/customfiles/etc/rc.local
+++ b/minikrebs/profiles/camkrebs_uvc/customfiles/etc/rc.local
diff --git a/minikrebs/profiles/camkrebs_uvc/customfiles/etc/shadow b/minikrebs/profiles/camkrebs_uvc/customfiles/etc/shadow
new file mode 100644
index 00000000..251abaf5
--- /dev/null
+++ b/minikrebs/profiles/camkrebs_uvc/customfiles/etc/shadow
@@ -0,0 +1,5 @@
+root:$1$spkPLKf6$KEM1l1DgouvYjeBfkT2wW1:0:0:99999:7:::
+daemon:*:0:0:99999:7:::
+ftp:*:0:0:99999:7:::
+network:*:0:0:99999:7:::
+nobody:*:0:0:99999:7:::