Skip to content
This repository
Browse code

Merge branch 'master' of git://openpli.git.sourceforge.net/gitroot/op…

…enpli/openpli-oe-core
  • Loading branch information...
commit 36ef638fca775a83cb682850c8358c092ab3774e 2 parents 0e21618 + 967d462
Captain authored December 25, 2012
2  meta-openpli/conf/machine/include/dreambox.inc
@@ -18,6 +18,8 @@ MACHINE_EXTRA_RRECOMMENDS = " \
18 18
 	"
19 19
 
20 20
 MACHINE_FEATURES += "alsa usbhost 3dtv switchoff tpm dreambox"
  21
+# Add "dreambox" override for recipes
  22
+MACHINEOVERRIDES .= ":dreambox"
21 23
 
22 24
 PREFERRED_PROVIDER_virtual/bootloader = "dreambox-secondstage-${MACHINE}"
23 25
 PREFERRED_PROVIDER_virtual/kernel = "linux-dreambox"
3  meta-openpli/recipes-connectivity/samba/samba/smb.conf
@@ -11,7 +11,8 @@
11 11
    preserve case=yes
12 12
    short preserve case=yes
13 13
    socket options = TCP_NODELAY
14  
-   preferred master = no ;(These stop the machine being master browser, which means that it doesn't waste time there.)
  14
+   preferred master = no
  15
+   local master = no
15 16
    oplocks = no
16 17
 
17 18
 [Root]
2  meta-openpli/recipes-connectivity/samba/samba_3.0.37.bbappend
... ...
@@ -1,4 +1,4 @@
1  
-PRINC = "4"
  1
+PRINC = "5"
2 2
 
3 3
 SRC_URI += " \
4 4
 	file://01samba-kill \
54  meta-openpli/recipes-core/busybox/busybox-1.19.4/simple.script
... ...
@@ -1,6 +1,5 @@
1 1
 #!/bin/sh
2  
-
3  
-# udhcpc script edited by Tim Riker <Tim@Rikers.org>
  2
+# Based on udhcpc script edited by Tim Riker <Tim@Rikers.org>
4 3
 
5 4
 [ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1
6 5
 
@@ -8,58 +7,27 @@ RESOLV_CONF="/etc/resolv.conf"
8 7
 [ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
9 8
 [ -n "$subnet" ] && NETMASK="netmask $subnet"
10 9
 
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 10
 case "$1" in
22 11
 	deconfig)
23 12
 		if [ -x /sbin/resolvconf ]; then
24 13
 			/sbin/resolvconf -d "${interface}.udhcpc"
25 14
 		fi
26  
-		if ! root_is_nfs ; then
27  
-                        if [ $have_bin_ip -eq 1 ]; then
28  
-                                ip addr flush dev $interface scope global
29  
-                                ip link set dev $interface up
30  
-                        else
31  
-                                /sbin/ifconfig $interface 0.0.0.0
32  
-                        fi
33  
-		fi
  15
+                ip addr flush dev $interface scope global
  16
+                ip link set dev $interface up
34 17
 		;;
35 18
 
36 19
 	renew|bound)
37  
-                if [ $have_bin_ip -eq 1 ]; then
38  
-                        ip addr add dev $interface local $ip/$mask $BROADCAST
39  
-                else
40  
-                        /sbin/ifconfig $interface $ip $BROADCAST $NETMASK
41  
-                fi
42  
-
  20
+		if [ -z "$BROADCAST" ]; then
  21
+			BROADCAST="broadcast +"
  22
+		fi
  23
+                ip addr add dev $interface local $ip/$mask $BROADCAST
43 24
 		if [ -n "$router" ] ; then
44  
-			if ! root_is_nfs ; then
45  
-                                if [ $have_bin_ip -eq 1 ]; then
46  
-                                        while ip route del default 2>/dev/null ; do
47  
-                                                :
48  
-                                        done
49  
-                                else
50  
-                                        while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do
51  
-                                                :
52  
-                                        done
53  
-                                fi
54  
-			fi
55  
-
  25
+                        while ip route del default 2>/dev/null ; do
  26
+                               :
  27
+                        done
56 28
 			metric=0
57 29
 			for i in $router ; do
58  
-                                if [ $have_bin_ip -eq 1 ]; then
59  
-                                        ip route add default via $i metric $metric
60  
-                                else
61  
-                                        route add default gw $i dev $interface metric $metric 2>/dev/null
62  
-                                fi
  30
+                                ip route add default via $i metric $metric
63 31
                                 metric=$(($metric + 1))
64 32
 			done
65 33
 		fi
2  meta-openpli/recipes-core/busybox/busybox_1.19.4.bbappend
... ...
@@ -1,4 +1,4 @@
1  
-PRINC = "25"
  1
+PRINC = "26"
2 2
 
3 3
 SRC_URI += " \
4 4
 			file://0001-ifupdown-support-post-up-pre-down-hooks.patch \
4  meta-openpli/recipes-linux/linux/linux-dreambox_3.2.bb
... ...
@@ -1,7 +1,7 @@
1  
-MACHINE_KERNEL_PR_append = ".${INC_PR}.31"
  1
+MACHINE_KERNEL_PR_append = ".${INC_PR}.32"
2 2
 
3 3
 PATCHREV = "b299a6a132d842b074b289b2568eece452d0663c"
4  
-PATCHLEVEL = "32"
  4
+PATCHLEVEL = "31"
5 5
 
6 6
 SRC_URI = " \
7 7
 			${KERNELORG_MIRROR}/linux/kernel/v3.x/linux-3.2.tar.bz2;name=kernel \
10  meta-openpli/recipes-openpli/bootlogo/openpli-bootlogo.bb
@@ -8,7 +8,7 @@ require conf/license/openpli-gplv2.inc
8 8
 RDEPENDS_${PN} += "showiframe"
9 9
 
10 10
 PV = "3.0"
11  
-PR = "r5"
  11
+PR = "r8"
12 12
 
13 13
 S = "${WORKDIR}/"
14 14
 
@@ -62,7 +62,7 @@ do_install() {
62 62
 	install -m 0755 ${S}/bootlogo.sh ${D}/${sysconfdir}/init.d/bootlogo
63 63
 }
64 64
 
65  
-pkg_preinst() {
  65
+pkg_preinst_dreambox() {
66 66
 	if [ -z "$D" ]
67 67
 	then
68 68
 		if mountpoint -q /boot
@@ -74,14 +74,14 @@ pkg_preinst() {
74 74
 	fi
75 75
 }
76 76
 
77  
-pkg_postinst() {
  77
+pkg_postinst_dreambox() {
78 78
 	if [ -z "$D" ]
79 79
 	then
80 80
 		umount /boot
81 81
 	fi
82 82
 }
83 83
 
84  
-pkg_prerm() {
  84
+pkg_prerm_dreambox() {
85 85
 	if [ -z "$D" ]
86 86
 	then
87 87
 		if mountpoint -q /boot
@@ -93,7 +93,7 @@ pkg_prerm() {
93 93
 	fi
94 94
 }
95 95
 
96  
-pkg_postrm() {
  96
+pkg_postrm_dreambox() {
97 97
 	if [ -z "$D" ]
98 98
 	then
99 99
 		umount /boot
BIN  meta-openpli/recipes-openpli/bootlogo/openpli-bootlogo/bootlogo.mvi 100755 → 100644
Binary file not shown

0 notes on commit 36ef638

Please sign in to comment.
Something went wrong with that request. Please try again.