[oe-commits] org.oe.dev merge of '3cb55f3839ae88970dfa5acd881fccfbd3a79fc8'

[oe commit]

merge of '3cb55f3839ae88970dfa5acd881fccfbd3a79fc8'
     and '46598fbaed38fc3e79d96b6bb061410fbea84c3d'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: e7cc52213db5e6315a468ba763aa847f68af5ab9
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e7cc52213db5e6315a468ba763aa847f68af5ab9
Files:
1
packages/netbase/netbase/fic-gta02
packages/netbase/netbase/fic-gta02/interfaces
packages/netbase/netbase_4.21.bb
classes/package_ipk.bbclass
packages/makedevs/makedevs_1.0.0.bb
Diffs:

#
# mt diff -r3cb55f3839ae88970dfa5acd881fccfbd3a79fc8 -re7cc52213db5e6315a468ba763aa847f68af5ab9
#
# 
# 
# add_dir "packages/netbase/netbase/fic-gta02"
# 
# add_file "packages/netbase/netbase/fic-gta02/interfaces"
#  content [b119191890448d523db7d93579548ffd89c4a050]
# 
# patch "packages/netbase/netbase_4.21.bb"
#  from [3fec27517cd3465754989f44477022d59bf7749a]
#    to [6f3ca0feab30d1dfc81d97ff3ab8c242e8084886]
# 
============================================================
--- packages/netbase/netbase/fic-gta02/interfaces	b119191890448d523db7d93579548ffd89c4a050
+++ packages/netbase/netbase/fic-gta02/interfaces	b119191890448d523db7d93579548ffd89c4a050
@@ -0,0 +1,28 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+ 
+# The loopback interface
+auto lo
+iface lo inet loopback
+
+# Wireless interfaces
+iface wlan0 inet dhcp
+wireless_mode managed
+wireless_essid any
+iface atml0 inet dhcp
+
+# Wired or wireless interfaces
+iface eth0 inet dhcp
+iface eth1 inet dhcp
+
+# Ethernet/RNDIS gadget (g_ether)
+# ... or on host side, usbnet and random hwaddr
+auto usb0
+iface usb0 inet static
+	address 192.168.0.202
+	netmask 255.255.255.0
+	network 192.168.0.0
+	gateway 192.168.0.200
+
+# Bluetooth networking
+iface bnep0 inet dhcp
+
============================================================
--- packages/netbase/netbase_4.21.bb	3fec27517cd3465754989f44477022d59bf7749a
+++ packages/netbase/netbase_4.21.bb	6f3ca0feab30d1dfc81d97ff3ab8c242e8084886
@@ -1,8 +1,8 @@ LICENSE = "GPL"
 DESCRIPTION = "This package provides the necessary \
 infrastructure for basic TCP/IP based networking."
 SECTION = "base"
 LICENSE = "GPL"
-PR = "r21"
+PR = "r22"
 
 inherit update-rc.d
 
@@ -21,20 +21,20 @@ SRC_URI = "${DEBIAN_MIRROR}/main/n/netba
            file://init \
            file://hosts \
            file://interfaces \
-	   file://if-pre-up.d \
-	   file://if-up.d \
-	   file://if-down.d \
-	   file://if-post-down.d"
+           file://if-pre-up.d \
+           file://if-up.d \
+           file://if-down.d \
+           file://if-post-down.d"
 
 do_install () {
-	install -d ${D}${sysconfdir}/init.d \
-		   ${D}${sbindir} \
-		   ${D}${mandir}/man8 \
-		   ${D}${sysconfdir}/network/if-pre-up.d \
-		   ${D}${sysconfdir}/network/if-up.d \
-		   ${D}${sysconfdir}/network/if-down.d \
-		   ${D}${sysconfdir}/network/if-post-down.d
-		   
+	install -d ${D}${sysconfdir}/init.d
+	install	-d ${D}${sbindir}
+	install -d ${D}${mandir}/man8
+	install -d ${D}${sysconfdir}/network/if-pre-up.d
+	install -d ${D}${sysconfdir}/network/if-up.d
+	install -d ${D}${sysconfdir}/network/if-down.d
+	install -d ${D}${sysconfdir}/network/if-post-down.d
+
 	for dir in if-pre-up.d if-up.d if-down.d if-post-down.d
 	do
 		for script in `ls -1 "${WORKDIR}/${dir}"`


#
# mt diff -r46598fbaed38fc3e79d96b6bb061410fbea84c3d -re7cc52213db5e6315a468ba763aa847f68af5ab9
#
# 
# 
# patch "classes/package_ipk.bbclass"
#  from [5147bb6ee1fb5160d355f56c4d345aba5b4ec236]
#    to [1872f53596730bd9e157720baf9341c875d2bc44]
# 
# patch "packages/makedevs/makedevs_1.0.0.bb"
#  from [0f986e091236be2f03c27ecc65eebe5bff386c31]
#    to [15bdc36f225d6d9098ea881e5a562ec59f1ab3db]
# 
============================================================
--- classes/package_ipk.bbclass	5147bb6ee1fb5160d355f56c4d345aba5b4ec236
+++ classes/package_ipk.bbclass	1872f53596730bd9e157720baf9341c875d2bc44
@@ -161,7 +161,7 @@ python do_package_ipk () {
 		localdata = bb.data.createCopy(d)
 		root = "%s/install/%s" % (workdir, pkg)
 
-        lf = lockfile(root + ".lock")
+		lf = lockfile(root + ".lock")
 
 		bb.data.setVar('ROOT', '', localdata)
 		bb.data.setVar('ROOT_%s' % pkg, root, localdata)
============================================================
--- packages/makedevs/makedevs_1.0.0.bb	0f986e091236be2f03c27ecc65eebe5bff386c31
+++ packages/makedevs/makedevs_1.0.0.bb	15bdc36f225d6d9098ea881e5a562ec59f1ab3db
@@ -1,10 +1,10 @@ S = "${WORKDIR}/makedevs-${PV}"
 DESCRIPTION = "A tool to make device nodes"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
 SRC_URI = "file://makedevs.c"
 S = "${WORKDIR}/makedevs-${PV}"
-PR = "r2"
+PR = "r3"
 
 do_configure() {
 	install -m 0644 ${WORKDIR}/makedevs.c ${S}/