[oe-commits] org.oe.dev merge of '707ad036e743d1d9e376f5872e832b2977285dc8'
mickeyl commit
oe at amethyst.openembedded.net
Sun Jun 29 22:34:58 UTC 2008
merge of '707ad036e743d1d9e376f5872e832b2977285dc8'
and 'a066601e9e566c2b3f758140100b9c2425bd110c'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 7e452155d66a6923b1853580146f2a10498d9a22
ViewMTN: http://monotone.openembedded.org/revision/info/7e452155d66a6923b1853580146f2a10498d9a22
Files:
1
packages/python/python-pygobject-native_2.14.2.bb
packages/python/python-pygobject_2.14.2.bb
packages/dsplink/dsplink-1.51
packages/dsplink/dsplink-1.51/prcs-fix-include.patch
packages/dsplink/dsplink.inc
packages/dsplink/dsplink_1.51.00.08.bb
packages/dsplink/dsplink_1.50.bb
packages/dsplink/files/CURRENTCFG.MK
Diffs:
#
# mt diff -r707ad036e743d1d9e376f5872e832b2977285dc8 -r7e452155d66a6923b1853580146f2a10498d9a22
#
#
#
# patch "packages/python/python-pygobject-native_2.14.2.bb"
# from [2c5a99049d9b09d3da49735baee00883f198ddd5]
# to [d78395a831a002217ede1cf06744916649027f47]
#
# patch "packages/python/python-pygobject_2.14.2.bb"
# from [7ac8453a5f164b5387345d2d84d82158b4a62738]
# to [2329eb924512eb266e9561b1d10303c4d293a33a]
#
============================================================
--- packages/python/python-pygobject-native_2.14.2.bb 2c5a99049d9b09d3da49735baee00883f198ddd5
+++ packages/python/python-pygobject-native_2.14.2.bb d78395a831a002217ede1cf06744916649027f47
@@ -1,9 +1,15 @@ DEPENDS = "python-native glib-2.0-native
require python-pygobject_${PV}.bb
DEPENDS = "python-native glib-2.0-native"
+PR = "r1"
inherit native
+SRC_URI = "\
+ ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2 \
+ file://python-path.patch;patch=1 \
+"
+
do_stage_append() {
install -d ${STAGING_BINDIR}
install -m 0755 gobject/generate-constants ${STAGING_BINDIR}/gobject-generate-constants
============================================================
--- packages/python/python-pygobject_2.14.2.bb 7ac8453a5f164b5387345d2d84d82158b4a62738
+++ packages/python/python-pygobject_2.14.2.bb 2329eb924512eb266e9561b1d10303c4d293a33a
@@ -2,7 +2,7 @@ DEPENDS = "python-pygobject-native"
SECTION = "devel/python"
LICENSE = "LGPL"
DEPENDS = "python-pygobject-native"
-PR = "r0"
+PR = "r1"
MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
#
# mt diff -ra066601e9e566c2b3f758140100b9c2425bd110c -r7e452155d66a6923b1853580146f2a10498d9a22
#
#
#
# add_dir "packages/dsplink/dsplink-1.51"
#
# add_file "packages/dsplink/dsplink-1.51/prcs-fix-include.patch"
# content [8ac90578a1ce466c71ff83f526660fcfda5dd74b]
#
# add_file "packages/dsplink/dsplink.inc"
# content [b86d9cd44a780cd1295db0a8c03477bd56444236]
#
# add_file "packages/dsplink/dsplink_1.51.00.08.bb"
# content [aea3b875753a4e513bc8a8ab9691100122972c3b]
#
# patch "packages/dsplink/dsplink_1.50.bb"
# from [96afc69329586c5e3228705622f5985fe5bde517]
# to [28706cfa3f5589f162d5dfbc64e293d18d04e2e4]
#
# patch "packages/dsplink/files/CURRENTCFG.MK"
# from [0e4942872b30854bdf3da67f5e9e8a6fd8918553]
# to [0bf38a5760260d24afeb780b24aa940164d593d4]
#
============================================================
--- packages/dsplink/dsplink-1.51/prcs-fix-include.patch 8ac90578a1ce466c71ff83f526660fcfda5dd74b
+++ packages/dsplink/dsplink-1.51/prcs-fix-include.patch 8ac90578a1ce466c71ff83f526660fcfda5dd74b
@@ -0,0 +1,49 @@
+--- /tmp/prcs.c 2008-05-15 20:35:49.946802023 +0200
++++ dsplink_1_50/dsplink/gpp/src/osal/Linux/prcs.c 2008-05-15 20:36:01.386858569 +0200
+@@ -17,6 +17,7 @@
+
+ /* ----------------------------------- OS Specific Headers */
+ #include <linux/autoconf.h>
++#include <linux/sched.h>
+ #include <linux/spinlock.h>
+ #include <linux/module.h>
+ #include <linux/mm.h>
+
+--- /tmp/mem.c 2008-06-22 16:05:16.000000000 +0200
++++ dsplink_1_50/dsplink/gpp/src/osal/Linux/2.6.18/mem.c 2008-06-22 16:05:43.000000000 +0200
+@@ -16,6 +16,7 @@
+
+
+ /* ----------------------------------- OS Specific Headers */
++
+ #include <linux/autoconf.h>
+ #include <linux/spinlock.h>
+ #if (defined(DM642_PCI) || defined (DM64LC_PCI))
+@@ -31,6 +32,7 @@
+ #endif /* if (defined(DM642_PCI) || defined (DM64LC_PCI)) */
+ #include <linux/vmalloc.h>
+ #include <asm/io.h>
++#include <linux/sched.h>
+
+ /* ----------------------------------- DSP/BIOS Link */
+ #include <dsplink.h>
+--- /tmp/hal_intgen.c 2008-06-29 23:42:05.000000000 +0200
++++ dsplink_1_51_00_08/dsplink/gpp/src/ldrv/HAL/OMAP/3530/hal_intgen.c 2008-06-29 23:42:18.000000000 +0200
+@@ -17,6 +17,7 @@
+
+
+ /* ----------------------------------- OS headers */
++#include <linux/autoconf.h>
+ #include <asm/io.h>
+
+ /* ----------------------------------- DSP/BIOS Link */
+--- /tmp/hal_prcm.c 2008-06-29 23:42:05.000000000 +0200
++++ dsplink_1_51_00_08/dsplink/gpp/src/ldrv/HAL/OMAP/3530/hal_prcm.c 2008-06-29 23:43:10.000000000 +0200
+@@ -18,6 +18,7 @@
+
+
+ /* ----------------------------------- OS headers */
++#include <linux/autoconf.h>
+ #include <asm/io.h>
+
+ /* ----------------------------------- DSP/BIOS Link */
============================================================
--- packages/dsplink/dsplink.inc b86d9cd44a780cd1295db0a8c03477bd56444236
+++ packages/dsplink/dsplink.inc b86d9cd44a780cd1295db0a8c03477bd56444236
@@ -0,0 +1,87 @@
+DESCRIPTION = "DSP Link for TI ARM/DSP processors"
+
+DEPENDS = "virtual/kernel perl-native"
+RDEPENDS = "update-modules"
+
+inherit module
+
+S = "${WORKDIR}/dsplink_1_50/dsplink"
+
+# Needed for buildscripts
+export DSPLINK = "${S}"
+
+DSPLINKPLATFORM ?= "Davinci"
+
+DSPLINKPLATFORM_omap5912osk = "OMAP"
+DSPLINKPLATFORM_beagleboard = "OMAP"
+DSPLINKPLATFORM_davinci-sffsdr = "Davinci"
+DSPLINKPLATFORM_davinci-dvevm = "Davinci"
+
+DSPLINKDSP ?= "C64XX"
+DSPLINKSOC ?= "DM6446"
+
+DSPLINKSOC_beagleboard = "3530"
+
+export DSPLINKPLATFORM
+export DSPLINKDSP
+
+do_configure () {
+ cp ${WORKDIR}/CURRENTCFG.MK ${S}/config
+ cp ${WORKDIR}/davinci_mvlpro5.0.mk ${S}/make/Linux
+ cp ${WORKDIR}/c64xx_5.xx_linux.mk ${S}/make/DspBios
+
+ sed -i -e s:SED_ME_SOURCEDIR:${S}:g \
+ -e s:SED_ME_GPPDISTRO:davinci_mvlpro5\.0:g \
+ -e s:SED_ME_KERNELVERSION:${KERNEL_VERSION}:g \
+ -e s:SED_ME_DSPDISTRO:davinci_mvlpro5\.0:g \
+ -e s:SED_ME_PLATFORM:${DSPLINKPLATFORM}:g \
+ -e s:SED_ME_DSP:${DSPLINKDSP}:g \
+ -e s:SED_ME_SOC:${DSPLINKSOC}:g \
+ ${S}/config/CURRENTCFG.MK
+
+ sed -i -e s:SED_ME_CROSS:${STAGING_INCDIR}:g \
+ -e s:SED_ME_STAGINGDIR:${STAGING_DIR_TARGET}:g \
+ -e s:SED_ME_TARGET_PREFIX:${TARGET_PREFIX}:g \
+ -e s:SED_ME_KERNELDIR:${STAGING_KERNEL_DIR}:g \
+ ${S}/make/Linux/davinci_mvlpro5.0.mk
+
+}
+
+PARALLEL_MAKE = ""
+
+do_compile () {
+ ln -sf ${S}/gpp/src/api/*h ${S}/gpp/inc/
+ ln -sf ${S}/gpp/src/pmgr/Linux/2.6.18 ${S}/gpp/src/pmgr/Linux/${KERNEL_VERSION}
+ ln -sf ${S}/gpp/src/api/Linux/2.6.18 ${S}/gpp/src/api/Linux/${KERNEL_VERSION}
+ ln -sf ${S}/gpp/src/osal/Linux/2.6.18 ${S}/gpp/src/osal/Linux/${KERNEL_VERSION}
+ ln -sf ${S}/gpp/src/pmgr/Linux/drv_pmgr.h ${S}/gpp/inc/drv_pmgr.h
+ ln -sf ${S}/gpp/src/pmgr/pmgr_proc.h ${S}/gpp/inc/pmgr_proc.h
+
+ unset DISPLAY
+
+ oe_runmake -C ${S}/gpp/src all targets
+ oe_runmake -C ${S}/gpp/src/samples
+}
+
+do_install () {
+ install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp
+ cp ${S}/gpp/BUILD/EXPORT/RELEASE/dsplinkk.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/
+}
+
+pkg_postinst_${PN}-module () {
+ if [ -n "$D" ]; then
+ exit 1
+ fi
+ depmod -a
+ update-modules || true
+}
+
+pkg_postrm_${PN}-module () {
+ update-modules || true
+}
+
+PACKAGES =+ "${PN}-module"
+FILES_${PN}-module = "${sysconfdir} /lib/modules"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
============================================================
--- packages/dsplink/dsplink_1.51.00.08.bb aea3b875753a4e513bc8a8ab9691100122972c3b
+++ packages/dsplink/dsplink_1.51.00.08.bb aea3b875753a4e513bc8a8ab9691100122972c3b
@@ -0,0 +1,19 @@
+require dsplink.inc
+
+PR = "r0"
+PE = "1"
+PV = "1.51"
+
+# Get dsplink tarball from TI website, place in sources and calculate
+# md5sum
+# Look for tarball at https://www-a.ti.com/downloads/sds_support/targetcontent/link/index.html
+
+SRC_URI = "http://install.tarball.in.source.dir/dsplink_1_51_00_08.tar.gz \
+ file://CURRENTCFG.MK \
+ file://c64xx_5.xx_linux.mk \
+ file://davinci_mvlpro5.0.mk \
+ file://prcs-fix-include.patch;patch=1;pnum=2 \
+"
+
+S = "${WORKDIR}/dsplink_1_51_00_08/dsplink"
+
============================================================
--- packages/dsplink/dsplink_1.50.bb 96afc69329586c5e3228705622f5985fe5bde517
+++ packages/dsplink/dsplink_1.50.bb 28706cfa3f5589f162d5dfbc64e293d18d04e2e4
@@ -1,10 +1,5 @@
-DESCRIPTION = "DSP Link for TI ARM/DSP processors"
+require dsplink.inc
-DEPENDS = "virtual/kernel perl-native"
-RDEPENDS = "update-modules"
-
-inherit module
-
PR = "r3"
PE = "1"
PV = "1.50"
@@ -22,77 +17,4 @@ S = "${WORKDIR}/dsplink_1_50/dsplink"
S = "${WORKDIR}/dsplink_1_50/dsplink"
-# Needed for buildscripts
-export DSPLINK = "${S}"
-DSPLINKPLATFORM ?= "Davinci"
-
-DSPLINKPLATFORM_omap5912osk = "Omap"
-DSPLINKPLATFORM_beagleboard = "Omap"
-DSPLINKPLATFORM_davinci-sffsdr = "Davinci"
-DSPLINKPLATFORM_davinci-dvevm = "Davinci"
-
-DSPLINKDSP ?= "C64XX"
-
-export DSPLINKPLATFORM
-export DSPLINKDSP
-
-do_configure () {
- cp ${WORKDIR}/CURRENTCFG.MK ${S}/config
- cp ${WORKDIR}/davinci_mvlpro5.0.mk ${S}/make/Linux
- cp ${WORKDIR}/c64xx_5.xx_linux.mk ${S}/make/DspBios
-
- sed -i -e s:SED_ME_SOURCEDIR:${S}:g \
- -e s:SED_ME_GPPDISTRO:davinci_mvlpro5\.0:g \
- -e s:SED_ME_KERNELVERSION:${KERNEL_VERSION}:g \
- -e s:SED_ME_DSPDISTRO:davinci_mvlpro5\.0:g \
- -e s:SED_ME_PLATFORM:${DSPLINKPLATFORM}:g \
- -e s:SED_ME_DSP:${DSPLINKDSP}:g \
- ${S}/config/CURRENTCFG.MK
-
- sed -i -e s:SED_ME_CROSS:${STAGING_INCDIR}:g \
- -e s:SED_ME_STAGINGDIR:${STAGING_DIR_TARGET}:g \
- -e s:SED_ME_TARGET_PREFIX:${TARGET_PREFIX}:g \
- -e s:SED_ME_KERNELDIR:${STAGING_KERNEL_DIR}:g \
- ${S}/make/Linux/davinci_mvlpro5.0.mk
-
-}
-
-PARALLEL_MAKE = ""
-
-do_compile () {
- ln -sf ${S}/gpp/src/api/*h ${S}/gpp/inc/
- ln -sf ${S}/gpp/src/pmgr/Linux/2.6.18 ${S}/gpp/src/pmgr/Linux/${KERNEL_VERSION}
- ln -sf ${S}/gpp/src/api/Linux/2.6.18 ${S}/gpp/src/api/Linux/${KERNEL_VERSION}
- ln -sf ${S}/gpp/src/osal/Linux/2.6.18 ${S}/gpp/src/osal/Linux/${KERNEL_VERSION}
- ln -sf ${S}/gpp/src/pmgr/Linux/drv_pmgr.h ${S}/gpp/inc/drv_pmgr.h
- ln -sf ${S}/gpp/src/pmgr/pmgr_proc.h ${S}/gpp/inc/pmgr_proc.h
-
- unset DISPLAY
-
- oe_runmake -C ${S}/gpp/src all targets
- oe_runmake -C ${S}/gpp/src/samples
-}
-
-do_install () {
- install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp
- cp ${S}/gpp/BUILD/EXPORT/RELEASE/dsplinkk.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/
-}
-
-pkg_postinst_${PN}-module () {
- if [ -n "$D" ]; then
- exit 1
- fi
- depmod -a
- update-modules || true
-}
-
-pkg_postrm_${PN}-module () {
- update-modules || true
-}
-
-PACKAGES =+ "${PN}-module"
-FILES_${PN}-module = "${sysconfdir} /lib/modules"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
============================================================
--- packages/dsplink/files/CURRENTCFG.MK 0e4942872b30854bdf3da67f5e9e8a6fd8918553
+++ packages/dsplink/files/CURRENTCFG.MK 0bf38a5760260d24afeb780b24aa940164d593d4
@@ -94,6 +94,6 @@ export PROBE := 0
# =========================================================
# Platform Variant
# =========================================================
-export VARIANT := DM6446
+export VARIANT := SED_ME_SOC
More information about the Openembedded-commits
mailing list