Merge bk://oe-devel@oe-devel.bkbits.net/openembedded

into stealth.nexus.co.uk:/home/pb/oe/oe

2005/01/28 16:45:10+00:00 nexus.co.uk!pb
apply latest networking suspend/resume patch from Erik Hovland

BKrev: 41fa6c51_5vsL558uqf9_CoPZTqNWg

diff --git a/conf/machine/ipaq-common.conf b/conf/machine/ipaq-common.conf
index dc7a2d0..bbd748b 100644 (file)
--- a/conf/machine/ipaq-common.conf
+++ b/conf/machine/ipaq-common.conf
@@ -1,4 +1,4 @@
 IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd pcmf502rd pcmf502re sa1100-rtc ipaq-hal h3600_ts usb-eth wavelan_cs keybdev" 
 
-BOOTSTRAP_EXTRA_DEPENDS += "ipaq-usbnet-support kbdd bl hostap-modules orinoco-modules mipv6"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "ipaq-usbnet-support kbdd bl hostap-modules-cs orinoco-modules-cs mipv6 ${@linux_module_packages('${IPAQ_MODULES}')}"
+BOOTSTRAP_EXTRA_DEPENDS += "kbdd bl hostap-modules orinoco-modules mipv6"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs mipv6 ${@linux_module_packages('${IPAQ_MODULES}')}"

diff --git a/packages/ipaq-usbnet-support/files/suspend-usbnet b/packages/ipaq-usbnet-support/files/suspend-usbnet
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/ipaq-usbnet-support/ipaq-usbnet-support_1.0.bb b/packages/ipaq-usbnet-support/ipaq-usbnet-support_1.0.bb
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/ipaq-usbnet-support/files/resume-usbnet b/packages/network-suspend-scripts/files/usbnet
similarity index 100%
rename from packages/ipaq-usbnet-support/files/resume-usbnet
rename to packages/network-suspend-scripts/files/usbnet

diff --git a/packages/network-suspend-scripts/network-suspend-scripts.bb b/packages/network-suspend-scripts/network-suspend-scripts.bb
index e69de29..2d61788 100644 (file)
--- a/packages/network-suspend-scripts/network-suspend-scripts.bb
+++ b/packages/network-suspend-scripts/network-suspend-scripts.bb
@@ -0,0 +1,18 @@
+LICENSE = "GPL"
+SRC_URI = "file://ifupdown \
+          file://usbnet"
+FILES = "${sysconfdir}/apm"
+PV = "1.1"
+
+do_install() {
+       install -d ${D}${sysconfdir}/apm/scripts.d
+       install -m 0755 ${WORKDIR}/ifupdown ${D}${sysconfdir}/apm/scripts.d
+       install -m 0755 ${WORKDIR}/usbnet ${D}${sysconfdir}/apm/scripts.d
+       install -d ${D}${sysconfdir}/apm/suspend.d
+       ln -s ../scripts.d/ifupdown ${D}${sysconfdir}/apm/suspend.d/05ifupdown
+       ln -s ../scripts.d/usbnet ${D}${sysconfdir}/apm/suspend.d/10usbnet
+       install -d ${D}${sysconfdir}/apm/resume.d
+       ln -sf ../scripts.d/ifupdown ${D}${sysconfdir}/apm/resume.d/30ifupdown
+       ln -sf ../scripts.d/usbnet ${D}${sysconfdir}/apm/resume.d/20usbnet
+}
+