[oe-commits] org.oe.dev merge of '8cdbac2cfd79ec0991df26af46cfe94d1a93ddfc'
mickeyl commit
oe at amethyst.openembedded.net
Sat Jul 12 14:18:13 UTC 2008
merge of '8cdbac2cfd79ec0991df26af46cfe94d1a93ddfc'
and '9c35b872809df23ffed33f2e6d3487f5ebde5390'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: c30fdd6492be56a4b798c8b1ff06c2ec56931d1b
ViewMTN: http://monotone.openembedded.org/revision/info/c30fdd6492be56a4b798c8b1ff06c2ec56931d1b
Files:
1
packages/dsplink/files/davinci_mvlpro5.0.mk
packages/dsplink/files/openembedded.mk
packages/gnuradio/gnuradio/gnuradio-libusb.patch
packages/linux/linux-omap2-git/beagleboard/cache-display-fix.patch
packages/dsplink/codec-engine_2.10.bb
packages/dsplink/dsplink.inc
packages/dsplink/dsplink_1.50.bb
packages/dsplink/dsplink_1.51.00.08.bb
packages/gnuradio/gnuradio_3.1.2.bb
packages/linux/linux-neuros_git.bb
packages/linux/linux-omap2-git/beagleboard/soc.patch
packages/linux/linux-omap2-git/omap3evm/soc.patch
packages/linux/linux-omap2_git.bb
packages/u-boot/u-boot_git.bb
packages/python/python-setuptools-native_0.6c6.bb
packages/python/python-setuptools-native_0.6c8.bb
packages/python/python-setuptools_0.6c6.bb
packages/python/python-setuptools_0.6c8.bb
packages/python/python-native-2.5.1/catchup-with-swig.patch
packages/python/python-native_2.5.1.bb
Diffs:
#
# mt diff -r8cdbac2cfd79ec0991df26af46cfe94d1a93ddfc -rc30fdd6492be56a4b798c8b1ff06c2ec56931d1b
#
#
#
# rename "packages/dsplink/files/davinci_mvlpro5.0.mk"
# to "packages/dsplink/files/openembedded.mk"
#
# add_file "packages/gnuradio/gnuradio/gnuradio-libusb.patch"
# content [956dc1f8905953f7f5d74b625be67d3026b535e6]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/cache-display-fix.patch"
# content [71f9b72b358b86739a7f55ecdbcd368ecd6cde8e]
#
# patch "packages/dsplink/codec-engine_2.10.bb"
# from [27ec35eee8d5be23f7a29ece8b87c24f3e403d08]
# to [d0a04985bc297f7fe5891b3d7a59ea8b34d231d8]
#
# patch "packages/dsplink/dsplink.inc"
# from [fca62e36a4305180437de4c7fb99f38394bd283d]
# to [117d2c759bf7fc07c00fed79f8791a67e9ee33a7]
#
# patch "packages/dsplink/dsplink_1.50.bb"
# from [a9e3ba59a084ded0b9f0ed96b0a405931edaa01c]
# to [ce809e113a66882d9ee366649c1fb63653d3d7bc]
#
# patch "packages/dsplink/dsplink_1.51.00.08.bb"
# from [0321486a05d21dda79c6ad70e4520b4f7d71c58d]
# to [2fc4774e9e387539e9a60ce9258fc27dcfb665f3]
#
# patch "packages/dsplink/files/openembedded.mk"
# from [042770d48dc6f826ec64e4d6d293f0edbf7d4bda]
# to [b47b79e9d9e41888d36cb92c94a6be77545971c2]
#
# patch "packages/gnuradio/gnuradio_3.1.2.bb"
# from [a493d7dd99415d1f1e1dfaf6e2ac38c3410caa91]
# to [fd75941f6d93fc3807de7a7f120a45ef91afdcb5]
#
# patch "packages/linux/linux-neuros_git.bb"
# from [34b3e338dd002f3fd5c5bc899e3ee6665bd2928f]
# to [b673fd21ed36cfdbbec862e53896693a7c7c324c]
#
# patch "packages/linux/linux-omap2-git/beagleboard/soc.patch"
# from [3c9184ebe013aa4d82f973de0ba1de1e33c85988]
# to [c3c011acbed072183328d636c1578f74bb59fde3]
#
# patch "packages/linux/linux-omap2-git/omap3evm/soc.patch"
# from [3c9184ebe013aa4d82f973de0ba1de1e33c85988]
# to [c3c011acbed072183328d636c1578f74bb59fde3]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [038137f8660e7c39b96a18d3d3947f245e440d45]
# to [26c924f048ec4a31e03284f8a09a9fcebcd5c6f6]
#
# patch "packages/u-boot/u-boot_git.bb"
# from [9ded7fb06cb65f1ee44e4355f91dbf7c6e105862]
# to [a76a67d588b4bc029e9a3d3fd1f8d255af4ccc2c]
#
============================================================
--- packages/gnuradio/gnuradio/gnuradio-libusb.patch 956dc1f8905953f7f5d74b625be67d3026b535e6
+++ packages/gnuradio/gnuradio/gnuradio-libusb.patch 956dc1f8905953f7f5d74b625be67d3026b535e6
@@ -0,0 +1,25 @@
+diff -Nurd gnuradio-3.1.2.orig/usrp/host/lib/legacy/usrp_prims.cc gnuradio-3.1.2/usrp/host/lib/legacy/usrp_prims.cc
+--- gnuradio-3.1.2.orig/usrp/host/lib/legacy/usrp_prims.cc 2008-03-05 16:12:38.000000000 -0500
++++ gnuradio-3.1.2/usrp/host/lib/legacy/usrp_prims.cc 2008-07-12 08:04:09.000000000 -0400
+@@ -131,10 +131,18 @@
+ static struct usb_device *
+ dev_handle_to_dev (usb_dev_handle *udh)
+ {
++ struct list_head {
++ struct list_head *prev, *next;
++ };
++
+ struct usb_dev_handle_kludge {
+- int fd;
+- struct usb_bus *bus;
+- struct usb_device *device;
++ /* lock protects claimed_interfaces */
++ pthread_mutex_t lock;
++ unsigned long claimed_interfaces;
++
++ struct list_head list;
++ struct usb_device *device;
++ unsigned char os_priv[0];
+ };
+
+ return ((struct usb_dev_handle_kludge *) udh)->device;
============================================================
--- packages/linux/linux-omap2-git/beagleboard/cache-display-fix.patch 71f9b72b358b86739a7f55ecdbcd368ecd6cde8e
+++ packages/linux/linux-omap2-git/beagleboard/cache-display-fix.patch 71f9b72b358b86739a7f55ecdbcd368ecd6cde8e
@@ -0,0 +1,238 @@
+On Tue, 2008-07-01 at 06:23 +0100, Dirk Behme wrote:
+> Catalin Marinas wrote:
+> > But, anyway, if you want a patch, Harry is updating it to a recent
+> > kernel.
+>
+> Any news on this? I think there are some people wanting a patch ;)
+
+See below for a preliminary patch updated to 2.6.26-rc8. Note that I
+don't plan to submit it in its current form but clean it up a bit first.
+
+
+Show the cache type of ARMv7 CPUs
+
+From: Catalin Marinas <catalin.marinas at arm.com>
+
+Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
+---
+
+ arch/arm/kernel/setup.c | 137 +++++++++++++++++++++++++++++++++++++++++++++-
+ include/asm-arm/system.h | 18 ++++++
+ 2 files changed, 153 insertions(+), 2 deletions(-)
+
+
+diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
+index 5ae0eb2..0cd238d 100644
+--- a/arch/arm/kernel/setup.c
++++ b/arch/arm/kernel/setup.c
+@@ -256,6 +256,24 @@ static const char *proc_arch[] = {
+ "?(17)",
+ };
+
++static const char *v7_cache_policy[4] = {
++ "reserved",
++ "AVIVT",
++ "VIPT",
++ "PIPT",
++};
++
++static const char *v7_cache_type[8] = {
++ "none",
++ "instruction only",
++ "data only",
++ "separate instruction and data",
++ "unified",
++ "unknown type",
++ "unknown type",
++ "unknown type",
++};
++
+ #define CACHE_TYPE(x) (((x) >> 25) & 15)
+ #define CACHE_S(x) ((x) & (1 << 24))
+ #define CACHE_DSIZE(x) (((x) >> 12) & 4095) /* only if S=1 */
+@@ -266,6 +284,22 @@ static const char *proc_arch[] = {
+ #define CACHE_M(y) ((y) & (1 << 2))
+ #define CACHE_LINE(y) ((y) & 3)
+
++#define CACHE_TYPE_V7(x) (((x) >> 14) & 3)
++#define CACHE_UNIFIED(x) ((((x) >> 27) & 7)+1)
++#define CACHE_COHERENT(x) ((((x) >> 24) & 7)+1)
++
++#define CACHE_ID_LEVEL_MASK 7
++#define CACHE_ID_LEVEL_BITS 3
++
++#define CACHE_LINE_V7(v) ((1 << (((v) & 7)+4)))
++#define CACHE_ASSOC_V7(v) ((((v) >> 3) & ((1<<10)-1))+1)
++#define CACHE_SETS_V7(v) ((((v) >> 13) & ((1<<15)-1))+1)
++#define CACHE_SIZE_V7(v) (CACHE_LINE_V7(v)*CACHE_ASSOC_V7(v)*CACHE_SETS_V7(v))
++#define CACHE_WA_V7(v) (((v) & (1<<28)) != 0)
++#define CACHE_RA_V7(v) (((v) & (1<<29)) != 0)
++#define CACHE_WB_V7(v) (((v) & (1<<30)) != 0)
++#define CACHE_WT_V7(v) (((v) & (1<<31)) != 0)
++
+ static inline void dump_cache(const char *prefix, int cpu, unsigned int cache)
+ {
+ unsigned int mult = 2 + (CACHE_M(cache) ? 1 : 0);
+@@ -279,11 +313,57 @@ static inline void dump_cache(const char *prefix, int cpu, unsigned int cache)
+ CACHE_LINE(cache)));
+ }
+
++static void dump_v7_cache(const char *type, int cpu, unsigned int level)
++{
++ unsigned int cachesize;
++
++ write_extended_cpuid(2,0,0,0,level); /* Set the cache size selection register */
++ write_extended_cpuid(0,7,5,4,0); /* Prefetch flush to wait for above */
++ cachesize = read_extended_cpuid(1,0,0,0);
++
++ printk("CPU%u: %s cache: %d bytes, associativity %d, %d byte lines, %d sets,\n supports%s%s%s%s\n",
++ cpu, type,
++ CACHE_SIZE_V7(cachesize),CACHE_ASSOC_V7(cachesize),
++ CACHE_LINE_V7(cachesize),CACHE_SETS_V7(cachesize),
++ CACHE_WA_V7(cachesize) ? " WA" : "",
++ CACHE_RA_V7(cachesize) ? " RA" : "",
++ CACHE_WB_V7(cachesize) ? " WB" : "",
++ CACHE_WT_V7(cachesize) ? " WT" : "");
++}
++
+ static void __init dump_cpu_info(int cpu)
+ {
+ unsigned int info = read_cpuid(CPUID_CACHETYPE);
+
+- if (info != processor_id) {
++ if (info != processor_id && (info & (1 << 31))) {
++ /* ARMv7 style of cache info register */
++ unsigned int id = read_extended_cpuid(1,0,0,1);
++ unsigned int level = 0;
++ printk("CPU%u: L1 I %s cache. Caches unified at level %u, coherent at level %u\n",
++ cpu,
++ v7_cache_policy[CACHE_TYPE_V7(info)],
++ CACHE_UNIFIED(id),
++ CACHE_COHERENT(id));
++
++ while (id & CACHE_ID_LEVEL_MASK) {
++ printk("CPU%u: Level %u cache is %s\n",
++ cpu, (level >> 1)+1, v7_cache_type[id & CACHE_ID_LEVEL_MASK]);
++
++ if (id & 1) {
++ /* Dump I at this level */
++ dump_v7_cache("I", cpu, level | 1);
++ }
++
++ if (id & (4 | 2)) {
++ /* Dump D or unified at this level */
++ dump_v7_cache((id & 4) ? "unified" : "D", cpu, level);
++ }
++
++ /* Next level out */
++ level += 2;
++ id >>= CACHE_ID_LEVEL_BITS;
++ }
++ } else if (info != processor_id) {
+ printk("CPU%u: D %s %s cache\n", cpu, cache_is_vivt() ? "VIVT" : "VIPT",
+ cache_types[CACHE_TYPE(info)]);
+ if (CACHE_S(info)) {
+@@ -916,6 +996,30 @@ c_show_cache(struct seq_file *m, const char *type, unsigned int cache)
+ CACHE_LINE(cache)));
+ }
+
++static void c_show_v7_cache(struct seq_file *m, const char *type, unsigned int levelselect)
++{
++ unsigned int cachesize;
++ unsigned int level = (levelselect >> 1) + 1;
++
++ write_extended_cpuid(2,0,0,0,levelselect); /* Set the cache size selection register */
++ write_extended_cpuid(0,7,5,4,0); /* Prefetch flush to wait for above */
++ cachesize = read_extended_cpuid(1,0,0,0);
++
++ seq_printf(m, "L%u %s size\t\t: %d bytes\n"
++ "L%u %s assoc\t\t: %d\n"
++ "L%u %s line length\t: %d\n"
++ "L%u %s sets\t\t: %d\n"
++ "L%u %s supports\t\t:%s%s%s%s\n",
++ level, type, CACHE_SIZE_V7(cachesize),
++ level, type, CACHE_ASSOC_V7(cachesize),
++ level, type, CACHE_LINE_V7(cachesize),
++ level, type, CACHE_SETS_V7(cachesize),
++ level, type, CACHE_WA_V7(cachesize) ? " WA" : "",
++ CACHE_RA_V7(cachesize) ? " RA" : "",
++ CACHE_WB_V7(cachesize) ? " WB" : "",
++ CACHE_WT_V7(cachesize) ? " WT" : "");
++}
++
+ static int c_show(struct seq_file *m, void *v)
+ {
+ int i;
+@@ -971,7 +1075,36 @@ static int c_show(struct seq_file *m, void *v)
+
+ {
+ unsigned int cache_info = read_cpuid(CPUID_CACHETYPE);
+- if (cache_info != processor_id) {
++ if (cache_info != processor_id && (cache_info & (1<<31))) {
++ /* V7 style of cache info register */
++ unsigned int id = read_extended_cpuid(1,0,0,1);
++ unsigned int levelselect = 0;
++ seq_printf(m, "L1 I cache\t:%s\n"
++ "Cache unification level\t: %u\n"
++ "Cache coherency level\t: %u\n",
++ v7_cache_policy[CACHE_TYPE_V7(cache_info)],
++ CACHE_UNIFIED(id),
++ CACHE_COHERENT(id));
++
++ while (id & CACHE_ID_LEVEL_MASK) {
++ seq_printf(m, "Level %u cache\t\t: %s\n",
++ (levelselect >> 1)+1, v7_cache_type[id & CACHE_ID_LEVEL_MASK]);
++
++ if (id & 1) {
++ /* Dump I at this level */
++ c_show_v7_cache(m, "I", levelselect | 1);
++ }
++
++ if (id & (4 | 2)) {
++ /* Dump D or unified at this level */
++ c_show_v7_cache(m, (id & 4) ? "cache" : "D", levelselect);
++ }
++
++ /* Next level out */
++ levelselect += 2;
++ id >>= CACHE_ID_LEVEL_BITS;
++ }
++ } else if (cache_info != processor_id) {
+ seq_printf(m, "Cache type\t: %s\n"
+ "Cache clean\t: %s\n"
+ "Cache lockdown\t: %s\n"
+diff --git a/include/asm-arm/system.h b/include/asm-arm/system.h
+index 514af79..704738e 100644
+--- a/include/asm-arm/system.h
++++ b/include/asm-arm/system.h
+@@ -74,6 +74,24 @@
+ : "cc"); \
+ __val; \
+ })
++#define read_extended_cpuid(op1,op2,op3,op4) \
++ ({ \
++ unsigned int __val; \
++ asm("mrc p15," __stringify(op1) ",%0,c" __stringify(op2)",c" __stringify(op3)"," __stringify(op4) \
++ : "=r" (__val) \
++ : \
++ : "cc"); \
++ __val; \
++ })
++
++#define write_extended_cpuid(op1,op2,op3,op4,v) \
++ ({ \
++ unsigned int __val = v; \
++ asm("mcr p15," __stringify(op1) ",%0,c" __stringify(op2)",c" __stringify(op3)"," __stringify(op4) \
++ : \
++ : "r" (__val) \
++ : "cc"); \
++ })
+ #else
+ extern unsigned int processor_id;
+ #define read_cpuid(reg) (processor_id)
+
+
+--
+Catalin
+
+
============================================================
--- packages/dsplink/codec-engine_2.10.bb 27ec35eee8d5be23f7a29ece8b87c24f3e403d08
+++ packages/dsplink/codec-engine_2.10.bb d0a04985bc297f7fe5891b3d7a59ea8b34d231d8
@@ -5,7 +5,7 @@ inherit module
inherit module
-PR = "r2"
+PR = "r3"
PV = "2.10"
# Get CE tarball from TI website, place in sources and calculate
@@ -72,6 +72,7 @@ FILES_dsplink-cmemk-module = "${sysconfd
PACKAGES =+ "dsplink-cmemk-module"
FILES_dsplink-cmemk-module = "${sysconfdir} /lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/*ko"
+INHIBIT_PACKAGE_STRIP = "1"
FILES_${PN} = "${base_sbindir}"
============================================================
--- packages/dsplink/dsplink.inc fca62e36a4305180437de4c7fb99f38394bd283d
+++ packages/dsplink/dsplink.inc 117d2c759bf7fc07c00fed79f8791a67e9ee33a7
@@ -23,18 +23,43 @@ DSPLINKSOC_beagleboard = "3530"
DSPLINKSOC_beagleboard = "3530"
+
+USERARMFLAGS = "${TARGET_CC_ARCH}"
+KERNELARMFLAGS = "-include linux/autoconf.h -c -iwithprefix include -Iinclude -Wall -Wstrict-prototypes \
+ -Wno-trigraphs -fno-strict-aliasing -fno-common \
+ -fno-omit-frame-pointer -mapcs -mno-sched-prolog \
+ -mlittle-endian \
+ -D__LINUX_ARM_ARCH__=5 -march=armv5t -mtune=arm9tdmi \
+ -msoft-float -Uarm -mapcs \
+ -Wdeclaration-after-statement -Os -marm -mabi=aapcs-linux"
+KERNELARMFLAGS_armv6 = "-include linux/autoconf.h -c -iwithprefix include -Iinclude -Wall -Wstrict-prototypes \
+ -Wno-trigraphs -fno-strict-aliasing -fno-common \
+ -fno-omit-frame-pointer -mapcs -mno-sched-prolog \
+ -mlittle-endian \
+ -D__LINUX_ARM_ARCH__=6 -march=armv6j -mtune=arm1136jf-s \
+ -msoft-float -Uarm -mapcs \
+ -Wdeclaration-after-statement -Os -marm -mabi=aapcs-linux"
+KERNELARMFLAGS_armv7a = "-c -nostdinc -include $(BASE_OSINC)/linux/autoconf.h -isystem $(OSINC_PLATFORM) -iwithprefix include -Iinclude -Wall -Wstrict-prototypes \
+ -Wno-trigraphs -fno-strict-aliasing -fno-common \
+ -fno-omit-frame-pointer -mapcs -mno-sched-prolog \
+ -mlittle-endian \
+ -D__LINUX_ARM_ARCH__=7 -march=armv7-a -mtune=cortex-a8 \
+ -msoft-float -Uarm -mapcs \
+ -Wdeclaration-after-statement -Os -marm -mabi=aapcs-linux \
+ -D__KERNEL__ -mno-thumb-interwork -msoft-float -fno-optimize-sibling-calls -g -fno-stack-protector -Wno-pointer-sign -g -DUSE_UDEV=1 -DOS_LINUX -DLINUX_KERNEL"
+
export DSPLINKPLATFORM
export DSPLINKDSP
do_configure () {
cp ${WORKDIR}/CURRENTCFG.MK ${S}/config
- cp ${WORKDIR}/davinci_mvlpro5.0.mk ${S}/make/Linux
+ cp ${WORKDIR}/openembedded.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_GPPDISTRO:openembedded:g \
-e s:SED_ME_KERNELVERSION:${KERNEL_VERSION}:g \
- -e s:SED_ME_DSPDISTRO:davinci_mvlpro5\.0:g \
+ -e s:SED_ME_DSPDISTRO:openembedded:g \
-e s:SED_ME_PLATFORM:${DSPLINKPLATFORM}:g \
-e s:SED_ME_DSP:${DSPLINKDSP}:g \
-e s:SED_ME_SOC:${DSPLINKSOC}:g \
@@ -43,8 +68,10 @@ do_configure () {
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
+ -e s:SED_ME_KERNELDIR:${STAGING_KERNEL_DIR}:g \
+ -e 's:SEDME_KERNEL_ARMFLAGS:${KERNELARMFLAGS}:g' \
+ -e 's:SEDME_USER_ARMFLAGS:${USERARMFLAGS}:g' \
+ ${S}/make/Linux/openembedded.mk
}
@@ -59,8 +86,11 @@ do_compile () {
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
+
+ sed -i -e 's:gcc:gcc${KERNEL_CCSUFFIX}:' ${S}/make/Linux/openembedded.mk
+ oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" -C ${S}/gpp/src all targets
+
+ sed -i -e 's:gcc${KERNEL_CCSUFFIX}:gcc:' ${S}/make/Linux/openembedded.mk
oe_runmake -C ${S}/gpp/src/samples
}
@@ -88,6 +118,7 @@ FILES_${PN} = "${bindir}/mpcsxfergpp ${b
PACKAGES =+ "${PN}-module"
FILES_${PN}-module = "${sysconfdir} /lib/modules"
FILES_${PN} = "${bindir}/mpcsxfergpp ${bindir}/ringiogpp"
+INHIBIT_PACKAGE_STRIP = "1"
PACKAGE_ARCH = "${MACHINE_ARCH}"
============================================================
--- packages/dsplink/dsplink_1.50.bb a9e3ba59a084ded0b9f0ed96b0a405931edaa01c
+++ packages/dsplink/dsplink_1.50.bb ce809e113a66882d9ee366649c1fb63653d3d7bc
@@ -1,6 +1,6 @@ require dsplink.inc
require dsplink.inc
-PR = "r6"
+PR = "r7"
PE = "1"
PV = "1.50"
@@ -11,%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r9c35b872809df23ffed33f2e6d3487f5ebde5390 -rc30fdd6492be56a4b798c8b1ff06c2ec56931d1b
#
#
#
# rename "packages/python/python-setuptools-native_0.6c6.bb"
# to "packages/python/python-setuptools-native_0.6c8.bb"
#
# rename "packages/python/python-setuptools_0.6c6.bb"
# to "packages/python/python-setuptools_0.6c8.bb"
#
# add_file "packages/python/python-native-2.5.1/catchup-with-swig.patch"
# content [7bba0c100105cbbbf93356d5cf23111808a4a8f2]
#
# patch "packages/python/python-native_2.5.1.bb"
# from [392d8ca5c7646d682ea0b9a49f56a2863651ee9d]
# to [6aa6388df8faacade25328d294fb0026f60c7547]
#
# patch "packages/python/python-setuptools_0.6c8.bb"
# from [84dd67b8d39b269a732a02fdc2b2b08af8516af9]
# to [122ed3dd626cef08ab8b57defb23846772fdaa38]
#
============================================================
--- packages/python/python-native-2.5.1/catchup-with-swig.patch 7bba0c100105cbbbf93356d5cf23111808a4a8f2
+++ packages/python/python-native-2.5.1/catchup-with-swig.patch 7bba0c100105cbbbf93356d5cf23111808a4a8f2
@@ -0,0 +1,13 @@
+Index: Python-2.5.1/Lib/distutils/command/build_ext.py
+===================================================================
+--- Python-2.5.1.orig/Lib/distutils/command/build_ext.py
++++ Python-2.5.1/Lib/distutils/command/build_ext.py
+@@ -513,7 +513,7 @@ class build_ext (Command):
+ target_lang=language)
+
+
+- def swig_sources (self, sources, extension):
++ def swig_sources (self, sources, extension=None):
+
+ """Walk the list of source files in 'sources', looking for SWIG
+ interface (.i) files. Run SWIG on all that are found, and
============================================================
--- packages/python/python-native_2.5.1.bb 392d8ca5c7646d682ea0b9a49f56a2863651ee9d
+++ packages/python/python-native_2.5.1.bb 6aa6388df8faacade25328d294fb0026f60c7547
@@ -4,15 +4,18 @@ DEPENDS = ""
SECTION = "devel/python"
PRIORITY = "optional"
DEPENDS = ""
-PR = "ml1"
+PR = "ml2"
EXCLUDE_FROM_WORLD = "1"
-SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
- file://bindir-libdir.patch;patch=1 \
- file://cross-distutils.patch;patch=1 \
- file://dont-modify-shebang-line.patch;patch=1 \
- file://default-is-optimized.patch;patch=1"
+SRC_URI = "\
+ http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
+ file://bindir-libdir.patch;patch=1 \
+ file://cross-distutils.patch;patch=1 \
+ file://dont-modify-shebang-line.patch;patch=1 \
+ file://default-is-optimized.patch;patch=1 \
+ file://catchup-with-swig.patch;patch=1 \
+"
S = "${WORKDIR}/Python-${PV}"
inherit autotools native
@@ -24,11 +27,6 @@ EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS=""
--without-cxx --with-signal-module --with-wctype-functions"
EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS=""'
-#do_configure() {
-# # the autofoo stuff is too old to allow regenerating
-# oe_runconf
-#}
-
do_stage_append() {
install -m 0755 Parser/pgen ${STAGING_BINDIR_NATIVE}/
}
============================================================
--- packages/python/python-setuptools_0.6c6.bb 84dd67b8d39b269a732a02fdc2b2b08af8516af9
+++ packages/python/python-setuptools_0.6c8.bb 122ed3dd626cef08ab8b57defb23846772fdaa38
@@ -5,7 +5,7 @@ SRCNAME = "setuptools"
LICENSE = "MIT-like"
RDEPENDS = "python-distutils python-compression"
SRCNAME = "setuptools"
-PR = "ml2"
+PR = "ml0"
SRC_URI = "http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz"
S = "${WORKDIR}/${SRCNAME}-${PV}"
More information about the Openembedded-commits
mailing list