diff options
author | Joshua Lock <josh@linux.intel.com> | 2010-05-25 15:36:14 +0100 |
---|---|---|
committer | Joshua Lock <josh@linux.intel.com> | 2010-05-25 15:36:14 +0100 |
commit | 615a98ed9a021da245513790c064761a0a5a67e9 (patch) | |
tree | cba72ce890e46d97e86edc2845dd379f98712907 /meta/packages/busybox/files | |
parent | cd62d697e1c746bad6dd29030f03a36750a1957e (diff) | |
download | poky-615a98ed9a021da245513790c064761a0a5a67e9.tar.gz |
busybox: bump to 1.15.3 from OE
Import the 1.15.3 recipe from OpenEmbedded and tweak to match Poky style
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta/packages/busybox/files')
-rw-r--r-- | meta/packages/busybox/files/busybox-appletlib-dependency.patch | 15 | ||||
-rw-r--r-- | meta/packages/busybox/files/find-touchscreen.sh | 9 | ||||
-rwxr-xr-x | meta/packages/busybox/files/mdev | 11 | ||||
-rw-r--r-- | meta/packages/busybox/files/mdev.conf | 33 | ||||
-rw-r--r-- | meta/packages/busybox/files/mountall | 1 | ||||
-rw-r--r-- | meta/packages/busybox/files/simple.script | 72 |
6 files changed, 141 insertions, 0 deletions
diff --git a/meta/packages/busybox/files/busybox-appletlib-dependency.patch b/meta/packages/busybox/files/busybox-appletlib-dependency.patch new file mode 100644 index 0000000000..3efd4c0882 --- /dev/null +++ b/meta/packages/busybox/files/busybox-appletlib-dependency.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Index: busybox-1.13.2/Makefile | ||
2 | =================================================================== | ||
3 | --- busybox-1.13.2.orig/Makefile 2009-03-19 15:44:37.419270265 +0300 | ||
4 | +++ busybox-1.13.2/Makefile 2009-03-19 15:45:57.737521296 +0300 | ||
5 | @@ -471,6 +471,10 @@ | ||
6 | util-linux/ \ | ||
7 | util-linux/volume_id/ \ | ||
8 | |||
9 | +# Lib interdeps | ||
10 | +# libbb uses headers generated in applets | ||
11 | +libbb: applets | ||
12 | + | ||
13 | endif # KBUILD_EXTMOD | ||
14 | |||
15 | ifeq ($(dot-config),1) | ||
diff --git a/meta/packages/busybox/files/find-touchscreen.sh b/meta/packages/busybox/files/find-touchscreen.sh new file mode 100644 index 0000000000..1582ea891c --- /dev/null +++ b/meta/packages/busybox/files/find-touchscreen.sh | |||
@@ -0,0 +1,9 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | if [ `egrep "input:.*-e0.*,3,.*a0,1,.*18,.*" /sys/class/input/$MDEV/device/modalias|wc -l` -gt 0 ]; then | ||
4 | ln -sf /dev/input/$MDEV /dev/input/touchscreen0 | ||
5 | fi | ||
6 | |||
7 | if [ `egrep "ads7846" /sys/class/input/$MDEV/device/modalias|wc -l` -gt 0 ]; then | ||
8 | ln -sf /dev/input/$MDEV /dev/input/touchscreen0 | ||
9 | fi | ||
diff --git a/meta/packages/busybox/files/mdev b/meta/packages/busybox/files/mdev new file mode 100755 index 0000000000..4eed51e94c --- /dev/null +++ b/meta/packages/busybox/files/mdev | |||
@@ -0,0 +1,11 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | mount -t tmpfs tmpfs /dev -o size=64k,mode=0755 | ||
4 | |||
5 | mkdir /dev/pts /dev/shm | ||
6 | |||
7 | mount -t devpts devpts /dev/pts | ||
8 | |||
9 | echo "/sbin/mdev" >/proc/sys/kernel/hotplug | ||
10 | |||
11 | mdev -s | ||
diff --git a/meta/packages/busybox/files/mdev.conf b/meta/packages/busybox/files/mdev.conf new file mode 100644 index 0000000000..163ebfe45d --- /dev/null +++ b/meta/packages/busybox/files/mdev.conf | |||
@@ -0,0 +1,33 @@ | |||
1 | console 0:0 0600 | ||
2 | cpu_dma_latency 0:0 0660 | ||
3 | fb0:0 44 0660 | ||
4 | full 0:0 0666 | ||
5 | initctl 0:0 0600 | ||
6 | ircomm[0-9].* 0:20 0660 | ||
7 | kmem 0:15 0640 | ||
8 | kmsg 0:0 0660 | ||
9 | log 0:0 0666 | ||
10 | loop[0-9].* 0:6 0640 | ||
11 | mem 0:15 0640 | ||
12 | network_latency 0:0 0660 | ||
13 | network_throughput 0:0 0660 | ||
14 | null 0:0 0666 | ||
15 | port 0:15 0640 | ||
16 | ptmx 0:5 0666 | ||
17 | ram[0-9].* 0:6 0640 | ||
18 | random 0:0 0666 | ||
19 | sda 0:6 0640 | ||
20 | tty 0:5 0666 | ||
21 | tty.* 0:0 0620 | ||
22 | urandom 0:0 0666 | ||
23 | usbdev.* 0:0 0660 | ||
24 | vcs.* 0:5 0660 | ||
25 | zero 0:0 0666 | ||
26 | |||
27 | pcm.* 0:0 0660 =snd/ | ||
28 | control.* 0:0 0660 =snd/ | ||
29 | timer 0:0 0660 =snd/ | ||
30 | |||
31 | event.* 0:0 0660 =input/ @/etc/mdev/find-touchscreen.sh | ||
32 | mice 0:0 0660 =input/ | ||
33 | mouse.* 0:0 0660 =input/ | ||
diff --git a/meta/packages/busybox/files/mountall b/meta/packages/busybox/files/mountall new file mode 100644 index 0000000000..d5408b8f8d --- /dev/null +++ b/meta/packages/busybox/files/mountall | |||
@@ -0,0 +1 @@ | |||
MOUNTALL="-t nonfs,nosmbfs,noncpfs" | |||
diff --git a/meta/packages/busybox/files/simple.script b/meta/packages/busybox/files/simple.script new file mode 100644 index 0000000000..5cc21b9de2 --- /dev/null +++ b/meta/packages/busybox/files/simple.script | |||
@@ -0,0 +1,72 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | # udhcpc script edited by Tim Riker <Tim@Rikers.org> | ||
4 | |||
5 | [ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 | ||
6 | |||
7 | RESOLV_CONF="/etc/resolv.conf" | ||
8 | [ -n "$broadcast" ] && BROADCAST="broadcast $broadcast" | ||
9 | [ -n "$subnet" ] && NETMASK="netmask $subnet" | ||
10 | |||
11 | # return 0 if root is mounted on a network filesystem | ||
12 | root_is_nfs() { | ||
13 | grep -qe '^/dev/root.*\(nfs\|smbfs\|ncp\|coda\) .*' /proc/mounts | ||
14 | } | ||
15 | |||
16 | have_bin_ip=0 | ||
17 | if [ -x /bin/ip ]; then | ||
18 | have_bin_ip=1 | ||
19 | fi | ||
20 | |||
21 | case "$1" in | ||
22 | deconfig) | ||
23 | if ! root_is_nfs ; then | ||
24 | if [ $have_bin_ip -eq 1 ]; then | ||
25 | ip addr flush dev $interface | ||
26 | ip link set dev $interface up | ||
27 | else | ||
28 | /sbin/ifconfig $interface 0.0.0.0 | ||
29 | fi | ||
30 | fi | ||
31 | ;; | ||
32 | |||
33 | renew|bound) | ||
34 | if [ $have_bin_ip -eq 1 ]; then | ||
35 | ip addr add dev $interface local $ip/$mask $BROADCAST | ||
36 | else | ||
37 | /sbin/ifconfig $interface $ip $BROADCAST $NETMASK | ||
38 | fi | ||
39 | |||
40 | if [ -n "$router" ] ; then | ||
41 | if ! root_is_nfs ; then | ||
42 | if [ $have_bin_ip -eq 1 ]; then | ||
43 | while ip route del default 2>/dev/null ; do | ||
44 | : | ||
45 | done | ||
46 | else | ||
47 | while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do | ||
48 | : | ||
49 | done | ||
50 | fi | ||
51 | fi | ||
52 | |||
53 | metric=0 | ||
54 | for i in $router ; do | ||
55 | if [ $have_bin_ip -eq 1 ]; then | ||
56 | ip route add default via $i metric $((metric++)) | ||
57 | else | ||
58 | route add default gw $i dev $interface metric $((metric++)) 2>/dev/null | ||
59 | fi | ||
60 | done | ||
61 | fi | ||
62 | |||
63 | echo -n > $RESOLV_CONF | ||
64 | [ -n "$domain" ] && echo search $domain >> $RESOLV_CONF | ||
65 | for i in $dns ; do | ||
66 | echo adding dns $i | ||
67 | echo nameserver $i >> $RESOLV_CONF | ||
68 | done | ||
69 | ;; | ||
70 | esac | ||
71 | |||
72 | exit 0 | ||