diff options
44 files changed, 2785 insertions, 90 deletions
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index 87fea8d622..eb0a403fb3 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -39,6 +39,7 @@ SRCREV_pn-openmoko-theme-standard2 ?= "${AUTOREV}" SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}" SRCREV_pn-openmoko-today2 ?= "${AUTOREV}" SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}" +SRCREV_pn-openmoko-toolchain-scripts ?= "${AUTOREV}" SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}" SRCREV_pn-openocd ?= "${AUTOREV}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 51fff86c0e..cdcf35d928 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -113,6 +113,7 @@ SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425" SRCREV_pn-openmoko-today ?= "3056" SRCREV_pn-openmoko-today2 ?= "3609" SRCREV_pn-openmoko-today2-folders ?= "3414" +SRCREV_pn-openmoko-toolchain-scripts ?= "3767" SRCREV_pn-openmoko-worldclock2 ?= "3365" SRCREV_pn-openocd ?= "206" SRCREV_pn-openocd-native ?= "206" diff --git a/packages/asterisk-core-sounds-en-alaw/.mtn2git_empty b/packages/asterisk-core-sounds-en-alaw/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/asterisk-core-sounds-en-alaw/.mtn2git_empty +++ /dev/null diff --git a/packages/asterisk-core-sounds-en-g729/.mtn2git_empty b/packages/asterisk-core-sounds-en-g729/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/asterisk-core-sounds-en-g729/.mtn2git_empty +++ /dev/null diff --git a/packages/asterisk-core-sounds-en-gsm/.mtn2git_empty b/packages/asterisk-core-sounds-en-gsm/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/asterisk-core-sounds-en-gsm/.mtn2git_empty +++ /dev/null diff --git a/packages/asterisk-core-sounds-en-ulaw/.mtn2git_empty b/packages/asterisk-core-sounds-en-ulaw/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/asterisk-core-sounds-en-ulaw/.mtn2git_empty +++ /dev/null diff --git a/packages/asterisk-extra-sounds-en-alaw/.mtn2git_empty b/packages/asterisk-extra-sounds-en-alaw/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/asterisk-extra-sounds-en-alaw/.mtn2git_empty +++ /dev/null diff --git a/packages/asterisk-extra-sounds-en-g729/.mtn2git_empty b/packages/asterisk-extra-sounds-en-g729/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/asterisk-extra-sounds-en-g729/.mtn2git_empty +++ /dev/null diff --git a/packages/asterisk-extra-sounds-en-gsm/.mtn2git_empty b/packages/asterisk-extra-sounds-en-gsm/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/asterisk-extra-sounds-en-gsm/.mtn2git_empty +++ /dev/null diff --git a/packages/asterisk-extra-sounds-en-ulaw/.mtn2git_empty b/packages/asterisk-extra-sounds-en-ulaw/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/asterisk-extra-sounds-en-ulaw/.mtn2git_empty +++ /dev/null diff --git a/packages/asterisk-moh-freeplay-alaw/.mtn2git_empty b/packages/asterisk-moh-freeplay-alaw/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/asterisk-moh-freeplay-alaw/.mtn2git_empty +++ /dev/null diff --git a/packages/asterisk-moh-freeplay-g729/.mtn2git_empty b/packages/asterisk-moh-freeplay-g729/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/asterisk-moh-freeplay-g729/.mtn2git_empty +++ /dev/null diff --git a/packages/asterisk-moh-freeplay-gsm/.mtn2git_empty b/packages/asterisk-moh-freeplay-gsm/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/asterisk-moh-freeplay-gsm/.mtn2git_empty +++ /dev/null diff --git a/packages/asterisk-moh-freeplay-ulaw/.mtn2git_empty b/packages/asterisk-moh-freeplay-ulaw/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/asterisk-moh-freeplay-ulaw/.mtn2git_empty +++ /dev/null diff --git a/packages/asterisk-core-sounds-en-alaw/asterisk-core-sounds-en-alaw_1.4.7.bb b/packages/asterisk/asterisk-core-sounds-en-alaw_1.4.7.bb index f1b3d12cd7..f1b3d12cd7 100644 --- a/packages/asterisk-core-sounds-en-alaw/asterisk-core-sounds-en-alaw_1.4.7.bb +++ b/packages/asterisk/asterisk-core-sounds-en-alaw_1.4.7.bb diff --git a/packages/asterisk-core-sounds-en-g729/asterisk-core-sounds-en-g729_1.4.7.bb b/packages/asterisk/asterisk-core-sounds-en-g729_1.4.7.bb index 205c8ff067..205c8ff067 100644 --- a/packages/asterisk-core-sounds-en-g729/asterisk-core-sounds-en-g729_1.4.7.bb +++ b/packages/asterisk/asterisk-core-sounds-en-g729_1.4.7.bb diff --git a/packages/asterisk-core-sounds-en-gsm/asterisk-core-sounds-en-gsm_1.4.7.bb b/packages/asterisk/asterisk-core-sounds-en-gsm_1.4.7.bb index 2a46c74f84..2a46c74f84 100644 --- a/packages/asterisk-core-sounds-en-gsm/asterisk-core-sounds-en-gsm_1.4.7.bb +++ b/packages/asterisk/asterisk-core-sounds-en-gsm_1.4.7.bb diff --git a/packages/asterisk-core-sounds-en-ulaw/asterisk-core-sounds-en-ulaw_1.4.7.bb b/packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.7.bb index c29ae60f99..c29ae60f99 100644 --- a/packages/asterisk-core-sounds-en-ulaw/asterisk-core-sounds-en-ulaw_1.4.7.bb +++ b/packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.7.bb diff --git a/packages/asterisk-extra-sounds-en-alaw/asterisk-extra-sounds-en-alaw_1.4.6.bb b/packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.6.bb index f18d46258f..f18d46258f 100644 --- a/packages/asterisk-extra-sounds-en-alaw/asterisk-extra-sounds-en-alaw_1.4.6.bb +++ b/packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.6.bb diff --git a/packages/asterisk-extra-sounds-en-g729/asterisk-extra-sounds-en-g729_1.4.6.bb b/packages/asterisk/asterisk-extra-sounds-en-g729_1.4.6.bb index 48fabbbdc4..48fabbbdc4 100644 --- a/packages/asterisk-extra-sounds-en-g729/asterisk-extra-sounds-en-g729_1.4.6.bb +++ b/packages/asterisk/asterisk-extra-sounds-en-g729_1.4.6.bb diff --git a/packages/asterisk-extra-sounds-en-gsm/asterisk-extra-sounds-en-gsm_1.4.6.bb b/packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.6.bb index da463391b1..da463391b1 100644 --- a/packages/asterisk-extra-sounds-en-gsm/asterisk-extra-sounds-en-gsm_1.4.6.bb +++ b/packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.6.bb diff --git a/packages/asterisk-extra-sounds-en-ulaw/asterisk-extra-sounds-en-ulaw_1.4.6.bb b/packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.6.bb index 6a6f3f5fba..6a6f3f5fba 100644 --- a/packages/asterisk-extra-sounds-en-ulaw/asterisk-extra-sounds-en-ulaw_1.4.6.bb +++ b/packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.6.bb diff --git a/packages/asterisk-moh-freeplay-alaw/asterisk-moh-freeplay-alaw_0.0.0.bb b/packages/asterisk/asterisk-moh-freeplay-alaw_0.0.0.bb index 96c662444e..96c662444e 100644 --- a/packages/asterisk-moh-freeplay-alaw/asterisk-moh-freeplay-alaw_0.0.0.bb +++ b/packages/asterisk/asterisk-moh-freeplay-alaw_0.0.0.bb diff --git a/packages/asterisk-moh-freeplay-g729/asterisk-moh-freeplay-g729_0.0.0.bb b/packages/asterisk/asterisk-moh-freeplay-g729_0.0.0.bb index 581e6bf84f..581e6bf84f 100644 --- a/packages/asterisk-moh-freeplay-g729/asterisk-moh-freeplay-g729_0.0.0.bb +++ b/packages/asterisk/asterisk-moh-freeplay-g729_0.0.0.bb diff --git a/packages/asterisk-moh-freeplay-gsm/asterisk-moh-freeplay-gsm_0.0.0.bb b/packages/asterisk/asterisk-moh-freeplay-gsm_0.0.0.bb index e45c3eec4e..e45c3eec4e 100644 --- a/packages/asterisk-moh-freeplay-gsm/asterisk-moh-freeplay-gsm_0.0.0.bb +++ b/packages/asterisk/asterisk-moh-freeplay-gsm_0.0.0.bb diff --git a/packages/asterisk-moh-freeplay-ulaw/asterisk-moh-freeplay-ulaw_0.0.0.bb b/packages/asterisk/asterisk-moh-freeplay-ulaw_0.0.0.bb index e0e0293c34..e0e0293c34 100644 --- a/packages/asterisk-moh-freeplay-ulaw/asterisk-moh-freeplay-ulaw_0.0.0.bb +++ b/packages/asterisk/asterisk-moh-freeplay-ulaw_0.0.0.bb diff --git a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb index 23d73ebae6..3101ecb3be 100644 --- a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb +++ b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb @@ -8,7 +8,7 @@ inherit native # Avoid circular dependencies from package_ipk.bbclass PACKAGES = "" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ipkg-utils" -INSTALL += "ipkg-list-fields arfile.py" +INSTALL += "arfile.py" do_stage() { for i in ${INSTALL}; do diff --git a/packages/meta/meta-toolchain-openmoko.bb b/packages/meta/meta-toolchain-openmoko.bb index b5e392ab1c..b7e5626f61 100644 --- a/packages/meta/meta-toolchain-openmoko.bb +++ b/packages/meta/meta-toolchain-openmoko.bb @@ -1,5 +1,7 @@ -TOOLCHAIN_TARGET_TASK = "task-toolchain-openmoko-sdk" +PR = "r1" -require meta-toolchain.bb +TOOLCHAIN_TARGET_TASK = "task-openmoko-toolchain-target" +TOOLCHAIN_HOST_TASK = "task-openmoko-toolchain-host" -SDK_SUFFIX = "toolchain-openmoko"
\ No newline at end of file +require meta-toolchain.bb +SDK_SUFFIX = "toolchain-openmoko" diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb index fc029505c3..923844ef8c 100644 --- a/packages/meta/meta-toolchain.bb +++ b/packages/meta/meta-toolchain.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Meta package for building a installable toolchain" LICENSE = "MIT" DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native" -PR = "r1" +PR = "r2" inherit sdk meta @@ -75,10 +75,17 @@ do_populate_sdk() { for arch in $revipkgarchs; do pkgnames=${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk if [ -e $pkgnames ]; then - echo "Found $pkgnames" + oenote "Found $pkgnames" cp $pkgnames ${SDK_OUTPUT}/${prefix}/ipk/ orig_pkg=`ipkg-list-fields $pkgnames | grep OE: | cut -d ' ' -f2` - pkg_subdir=$arch${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]} + pkg_subdir_postfix=${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]} + for aarch in $revipkgarchs; do + if [ -e "${STAGING_DIR}/pkgdata/${aarch}${pkg_subdir_postfix}/${orig_pkg}" ]; then + pkg_subdir="${aarch}${pkg_subdir_postfix}" + break + fi + done + oenote "Original package in ${pkg_subdir}" mkdir -p ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime cp ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/ subpkgs=`cat ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg | grep PACKAGES: | cut -b 10-` diff --git a/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb b/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb index 1526cbab55..7533f81958 100644 --- a/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb +++ b/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb @@ -1,15 +1,14 @@ DESCRIPTION = "Convenient scripts to be used with openmoko toolchain." -PACKAGE_ARCH = "all" +PR = "r1" SRC_URI = "svn://svn.openmoko.org/developers/john_lee;module=toolkit;proto=http" -SRC_URI += "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/applications;module=openmoko-sample2;proto=http" -SRCREV="3630" +S = "${WORKDIR}/toolkit" + FILES_${PN} = "/" do_install () { - (find ${WORKDIR} -type d -name ".svn" | xargs rm -rf) || true - install -m 755 -d ${D}/share - cp -dr ${WORKDIR}/toolkit/* ${D} - cp -dr ${WORKDIR}/openmoko-sample2 ${D}/share + cp -dr ${S}/* ${D} + find ${D} -name ".svn" | xargs rm -rf + rm -r ${D}/patches } diff --git a/packages/openmoko2/openmoko-sample2_svn.bb b/packages/openmoko2/openmoko-sample2_svn.bb index 4c2c5aad46..9118f89e8a 100644 --- a/packages/openmoko2/openmoko-sample2_svn.bb +++ b/packages/openmoko2/openmoko-sample2_svn.bb @@ -9,7 +9,7 @@ inherit openmoko2 PACKAGES += "${PN}-src" # path should match the toolchain path FILES_${PN}-src = "/usr/local/openmoko" -PACKAGE_ARCH_${PN}-src = "all" +PACKAGE_ARCH_${PN}-src = "${BUILD_ARCH}-all-sdk" do_configure_prepend() { install -d ${WORKDIR}/source diff --git a/packages/orinoco/orinoco-modules.inc b/packages/orinoco/orinoco-modules.inc new file mode 100644 index 0000000000..fc14eb3ee5 --- /dev/null +++ b/packages/orinoco/orinoco-modules.inc @@ -0,0 +1,21 @@ +DESCRIPTION = "A driver for wireless LAN cards based on Hermes(Orinoco) cards. \ +Also contains support for cards using downloadable firmware, i.e. the Symbol/Socket family." +SECTION = "kernel/modules" +PRIORITY = "optional" +PROVIDES = "spectrum-modules" +LICENSE = "GPL" + +SRC_URI = "http://ozlabs.org/people/dgibson/dldwd/orinoco-${PV}.tar.gz" +S = "${WORKDIR}/orinoco-${PV}" + +inherit module + +PACKAGES = "orinoco-modules-cs orinoco-modules-pci orinoco-modules-usb orinoco-modules-nortel orinoco-modules" +FILES_orinoco-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/orinoco_p*${KERNEL_OBJECT_SUFFIX}" +FILES_orinoco-modules-usb = "/lib/modules/${KERNEL_VERSION}/net/*_usb${KERNEL_OBJECT_SUFFIX}" +FILES_orinoco-modules-nortel = "/lib/modules/${KERNEL_VERSION}/net/orinoco_tmd${KERNEL_OBJECT_SUFFIX} \ + /lib/modules/${KERNEL_VERSION}/net/orinoco_nortel${KERNEL_OBJECT_SUFFIX}" +FILES_orinoco-modules = "/lib/modules/" +RDEPENDS_orinoco-modules-pci = "orinoco-modules" +RDEPENDS_orinoco-modules-usb = "orinoco-modules" +RDEPENDS_orinoco-modules-nortel = "orinoco-modules" diff --git a/packages/orinoco/orinoco-modules_0.13e.bb b/packages/orinoco/orinoco-modules_0.13e.bb index 9c5cc2f776..f8f8e446a9 100644 --- a/packages/orinoco/orinoco-modules_0.13e.bb +++ b/packages/orinoco/orinoco-modules_0.13e.bb @@ -1,11 +1,8 @@ -DESCRIPTION = "A driver for wireless LAN cards based on Hermes(Orinoco) cards. \ -Also contains support for cards using downloadable firmware, i.e. the Symbol/Socket family." -SECTION = "kernel/modules" -PRIORITY = "optional" -LICENSE = "GPL" +require orinoco-modules.inc + PR = "r4" -SRC_URI = "http://ozlabs.org/people/dgibson/dldwd/orinoco-${PV}.tar.gz; \ +SRC_URI += "\ file://crosscompile.patch;patch=1 \ file://monitor-${PV}.patch;patch=1 \ file://spectrum.conf \ @@ -14,8 +11,6 @@ SRC_URI = "http://ozlabs.org/people/dgibson/dldwd/orinoco-${PV}.tar.gz; \ file://orinoco_cs.conf" S = "${WORKDIR}/orinoco-${PV}" -inherit module - do_compile_prepend() { cp -f ${WORKDIR}/spectrum* ${S}/ } @@ -30,14 +25,5 @@ do_install() { install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}${sysconfdir}/modutils/ } -PACKAGES = "orinoco-modules-cs orinoco-modules-pci orinoco-modules-usb orinoco-modules-nortel orinoco-modules" FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX} /${sysconfdir}" -FILES_orinoco-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/orinoco_p*${KERNEL_OBJECT_SUFFIX}" -FILES_orinoco-modules-usb = "/lib/modules/${KERNEL_VERSION}/net/*_usb${KERNEL_OBJECT_SUFFIX}" -FILES_orinoco-modules-nortel = "/lib/modules/${KERNEL_VERSION}/net/orinoco_tmd${KERNEL_OBJECT_SUFFIX} \ - /lib/modules/${KERNEL_VERSION}/net/orinoco_nortel${KERNEL_OBJECT_SUFFIX}" -FILES_orinoco-modules = "/lib/modules/" RDEPENDS_orinoco-modules-cs = "orinoco-modules" -RDEPENDS_orinoco-modules-pci = "orinoco-modules" -RDEPENDS_orinoco-modules-usb = "orinoco-modules" -RDEPENDS_orinoco-modules-nortel = "orinoco-modules" diff --git a/packages/orinoco/orinoco-modules_0.15rc1.bb b/packages/orinoco/orinoco-modules_0.15rc1.bb index ebf0f03bbf..7289b6eaf8 100644 --- a/packages/orinoco/orinoco-modules_0.15rc1.bb +++ b/packages/orinoco/orinoco-modules_0.15rc1.bb @@ -1,10 +1,7 @@ -DESCRIPTION = "A driver for wireless LAN cards based on Hermes(Orinoco) cards. \ -Also contains support for cards using downloadable firmware, i.e. the Symbol/Socket family." -SECTION = "kernel/modules" -PRIORITY = "optional" +require orinoco-modules.inc + DEPENDS = "orinoco-conf spectrum-fw" RDEPENDS = "orinoco-conf" -LICENSE = "GPL" PR = "r7" SRC_URI = "${SOURCEFORGE_MIRROR}/orinoco/orinoco-${PV}.tar.gz \ @@ -13,23 +10,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/orinoco/orinoco-${PV}.tar.gz \ file://add_event.patch;patch=1 \ file://add_utsname.patch;patch=1 \ file://spectrum_cs_ids.patch;patch=1" -S = "${WORKDIR}/orinoco-${PV}" - -inherit module do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/ install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/ } -PACKAGES = "orinoco-modules-cs orinoco-modules-pci orinoco-modules-usb orinoco-modules-nortel orinoco-modules" FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX}" -FILES_orinoco-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/orinoco_p*${KERNEL_OBJECT_SUFFIX}" -FILES_orinoco-modules-usb = "/lib/modules/${KERNEL_VERSION}/net/*_usb${KERNEL_OBJECT_SUFFIX}" -FILES_orinoco-modules-nortel = "/lib/modules/${KERNEL_VERSION}/net/orinoco_tmd${KERNEL_OBJECT_SUFFIX} \ - /lib/modules/${KERNEL_VERSION}/net/orinoco_nortel${KERNEL_OBJECT_SUFFIX}" -FILES_orinoco-modules = "/lib/modules/" RDEPENDS_orinoco-modules-cs = "orinoco-modules spectrum-fw" -RDEPENDS_orinoco-modules-pci = "orinoco-modules" -RDEPENDS_orinoco-modules-usb = "orinoco-modules" -RDEPENDS_orinoco-modules-nortel = "orinoco-modules" diff --git a/packages/orinoco/orinoco-modules_0.15rc2.bb b/packages/orinoco/orinoco-modules_0.15rc2.bb index 4153e8c4fc..da223fca7d 100644 --- a/packages/orinoco/orinoco-modules_0.15rc2.bb +++ b/packages/orinoco/orinoco-modules_0.15rc2.bb @@ -1,37 +1,21 @@ -DESCRIPTION = "A driver for wireless LAN cards based on Hermes(Orinoco) cards. \ -Also contains support for cards using downloadable firmware, i.e. the Symbol/Socket family." -SECTION = "kernel/modules" -PRIORITY = "optional" -PROVIDES = "spectrum-modules" +require orinoco-modules.inc + DEPENDS = "orinoco-conf spectrum-fw" RDEPENDS = "orinoco-conf" -LICENSE = "GPL" PR = "r9" -SRC_URI = "http://ozlabs.org/people/dgibson/dldwd/orinoco-${PV}.tar.gz \ +SRC_URI += "\ file://makefile_fix.patch;patch=1 \ file://list-move.patch;patch=1 \ file://add_utsname.patch;patch=1 \ file://add_event.patch;patch=1 \ file://spectrum_cs_ids.patch;patch=1 \ file://catch-up-with-kernel-changes.patch;patch=1" -S = "${WORKDIR}/orinoco-${PV}" - -inherit module do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/ install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/ } -PACKAGES = "orinoco-modules-cs orinoco-modules-pci orinoco-modules-usb orinoco-modules-nortel orinoco-modules" FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX}" -FILES_orinoco-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/orinoco_p*${KERNEL_OBJECT_SUFFIX}" -FILES_orinoco-modules-usb = "/lib/modules/${KERNEL_VERSION}/net/*_usb${KERNEL_OBJECT_SUFFIX}" -FILES_orinoco-modules-nortel = "/lib/modules/${KERNEL_VERSION}/net/orinoco_tmd${KERNEL_OBJECT_SUFFIX} \ - /lib/modules/${KERNEL_VERSION}/net/orinoco_nortel${KERNEL_OBJECT_SUFFIX}" -FILES_orinoco-modules = "/lib/modules/" RDEPENDS_orinoco-modules-cs = "orinoco-modules spectrum-fw" -RDEPENDS_orinoco-modules-pci = "orinoco-modules" -RDEPENDS_orinoco-modules-usb = "orinoco-modules" -RDEPENDS_orinoco-modules-nortel = "orinoco-modules" diff --git a/packages/orinoco/orinoco-modules_cvs.bb b/packages/orinoco/orinoco-modules_cvs.bb index 5d3efec80f..78bfd2ce0f 100644 --- a/packages/orinoco/orinoco-modules_cvs.bb +++ b/packages/orinoco/orinoco-modules_cvs.bb @@ -1,11 +1,7 @@ -DESCRIPTION = "A driver for wireless LAN cards based on Hermes(Orinoco) cards. \ -Also contains support for cards using downloadable firmware, i.e. the Symbol/Socket family." -SECTION = "kernel/modules" -PRIORITY = "optional" -PROVIDES = "spectrum-modules" +require orinoco-modules.inc + DEPENDS = "orinoco-conf spectrum-fw" RDEPENDS = "orinoco-conf" -LICENSE = "GPL" PR = "r2" PARALLEL_MAKE = "" @@ -18,21 +14,10 @@ SRC_URI = "cvs://anonymous@cvs.sv.gnu.org/cvsroot/orinoco;module=orinoco;method= file://list-move.patch;patch=1" S = "${WORKDIR}/orinoco" -inherit module - do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/ install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/ } -PACKAGES = "orinoco-modules-cs orinoco-modules-pci orinoco-modules-usb orinoco-modules-nortel orinoco-modules" FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX}" -FILES_orinoco-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/orinoco_p*${KERNEL_OBJECT_SUFFIX}" -FILES_orinoco-modules-usb = "/lib/modules/${KERNEL_VERSION}/net |