From 5e4a6d8ae715b6dc7108e87eed505c785589fe79 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Fri, 28 Jan 2005 16:46:09 +0000 Subject: [PATCH] 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 --- conf/machine/ipaq-common.conf | 4 ++-- .../ipaq-usbnet-support/files/suspend-usbnet | 0 .../ipaq-usbnet-support_1.0.bb | 0 .../files/usbnet} | 0 .../network-suspend-scripts.bb | 18 ++++++++++++++++++ 5 files changed, 20 insertions(+), 2 deletions(-) delete mode 100644 packages/ipaq-usbnet-support/files/suspend-usbnet delete mode 100644 packages/ipaq-usbnet-support/ipaq-usbnet-support_1.0.bb rename packages/{ipaq-usbnet-support/files/resume-usbnet => network-suspend-scripts/files/usbnet} (100%) diff --git a/conf/machine/ipaq-common.conf b/conf/machine/ipaq-common.conf index dc7a2d05c3..bbd748b701 100644 --- 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 index e69de29bb2..0000000000 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 index e69de29bb2..0000000000 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 e69de29bb2..2d61788110 100644 --- 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 +} + -- 2.39.5