[oe-commits] org.oe.dev merge of '60155ceff0e3c21add064d22518f08c6b3c5a304'
koen commit
openembedded-commits at lists.openembedded.org
Fri Dec 7 16:57:05 UTC 2007
merge of '60155ceff0e3c21add064d22518f08c6b3c5a304'
and 'b0dc261f9674aecabb4a43c73a328aaba4ec338a'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 5f7726df2e142e360d9217ff5a131230d200e19d
ViewMTN: http://monotone.openembedded.org/revision/info/5f7726df2e142e360d9217ff5a131230d200e19d
Files:
1
packages/python/python-pysqlite2
packages/python/python-django_0.96.1.bb
packages/python/python-pysqlite2/fix-setup.patch
packages/python/python-pysqlite2_2.4.0.bb
classes/package_ipk.bbclass
conf/sanity.conf
packages/directfb/directfb_1.1.0.bb
packages/linux/linux-2.6.23/leds-cpu-activity-powerpc.patch
packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig
Diffs:
#
# mt diff -r60155ceff0e3c21add064d22518f08c6b3c5a304 -r5f7726df2e142e360d9217ff5a131230d200e19d
#
#
#
# add_dir "packages/python/python-pysqlite2"
#
# add_file "packages/python/python-django_0.96.1.bb"
# content [4a5c22d046500c578125011846082f2958496821]
#
# add_file "packages/python/python-pysqlite2/fix-setup.patch"
# content [2dd57a23d7ac3ccea71558d925e5f243970e2449]
#
# add_file "packages/python/python-pysqlite2_2.4.0.bb"
# content [617a7751e48a571c7049118a1ddff35a47317af5]
#
# patch "classes/package_ipk.bbclass"
# from [fdf9fdf2855198b24b017026dd3777995b2977d2]
# to [229c27cf2e464faca3930ca8626c1a6fdf5b51be]
#
# patch "conf/sanity.conf"
# from [0ca4f223707a3e2792c4eb0b4ab4ada4461ee385]
# to [9ad5f1d9953217df59e03a3c6727b8246f383334]
#
# patch "packages/directfb/directfb_1.1.0.bb"
# from [1af7bf22ffbfcbc869a08e6664c2dde2ff16c7d2]
# to [b13ed5a2cee07ae6410cd0eddde2ccbd14dd6b79]
#
============================================================
--- packages/python/python-django_0.96.1.bb 4a5c22d046500c578125011846082f2958496821
+++ packages/python/python-django_0.96.1.bb 4a5c22d046500c578125011846082f2958496821
@@ -0,0 +1,16 @@
+DESCRIPTION = "Python Web framework"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "BSD"
+RDEPENDS = "python-email python-netserver python-pickle python-pprint \
+ python-shell python-textutils python-threading python-unixadmin \
+ python-xml"
+RRECOMMENDS = "python-pysqlite2"
+SRCNAME = "Django"
+
+SRC_URI = "http://media.djangoproject.com/releases/0.96/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
+
+DISTUTILS_INSTALL_ARGS = "--root=${D} --prefix=${prefix}"
============================================================
--- packages/python/python-pysqlite2/fix-setup.patch 2dd57a23d7ac3ccea71558d925e5f243970e2449
+++ packages/python/python-pysqlite2/fix-setup.patch 2dd57a23d7ac3ccea71558d925e5f243970e2449
@@ -0,0 +1,9 @@
+diff -urN pysqlite-2.4.0.orig/setup.cfg pysqlite-2.4.0/setup.cfg
+--- pysqlite-2.4.0.orig/setup.cfg 2007-11-25 17:56:17.000000000 +0100
++++ pysqlite-2.4.0/setup.cfg 2007-12-07 09:59:36.000000000 +0100
+@@ -1,5 +1,3 @@
+ [build_ext]
+ define=
+-include_dirs=/usr/include
+-library_dirs=/usr/lib
+ libraries=sqlite3
============================================================
--- packages/python/python-pysqlite2_2.4.0.bb 617a7751e48a571c7049118a1ddff35a47317af5
+++ packages/python/python-pysqlite2_2.4.0.bb 617a7751e48a571c7049118a1ddff35a47317af5
@@ -0,0 +1,17 @@
+DESCRIPTION = "Python interface to SQLite 3"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "BSD"
+DEPENDS = "sqlite3"
+SRCNAME = "pysqlite"
+
+SRC_URI = "http://initd.org/pub/software/pysqlite/releases/2.4/${PV}/${SRCNAME}-${PV}.tar.gz \
+ file://fix-setup.patch;patch=1"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
+
+do_install_append() {
+ install -d ${D}${datadir}/doc/
+ mv ${D}${datadir}/pysqlite2-doc ${D}${datadir}/doc/${PN}
+}
============================================================
--- classes/package_ipk.bbclass fdf9fdf2855198b24b017026dd3777995b2977d2
+++ classes/package_ipk.bbclass 229c27cf2e464faca3930ca8626c1a6fdf5b51be
@@ -114,7 +114,7 @@ python do_package_ipk () {
}
python do_package_ipk () {
- import sys, re, copy
+ import sys, re, copy, fcntl
workdir = bb.data.getVar('WORKDIR', d, 1)
if not workdir:
@@ -147,6 +147,16 @@ python do_package_ipk () {
bb.debug(1, "No packages; nothing to do")
return
+ def lockfile(name):
+ lf = open(name, "a+")
+ fcntl.flock(lf.fileno(), fcntl.LOCK_EX)
+ return lf
+
+ def unlockfile(lf):
+ fcntl.flock(lf.fileno(), fcntl.LOCK_UN)
+ lf.close
+
+
for pkg in packages.split():
localdata = bb.data.createCopy(d)
pkgdest = bb.data.getVar('PKGDEST', d, 1)
@@ -183,7 +193,7 @@ python do_package_ipk () {
if not g and bb.data.getVar('ALLOW_EMPTY', localdata) != "1":
from bb import note
note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1)))
- bb.utils.unlockfile(lf)
+ unlockfile(lf)
continue
controldir = os.path.join(root, 'CONTROL')
@@ -191,7 +201,7 @@ python do_package_ipk () {
try:
ctrlfile = file(os.path.join(controldir, 'control'), 'w')
except OSError:
- bb.utils.unlockfile(lf)
+ unlockfile(lf)
raise bb.build.FuncFailed("unable to open control file for writing.")
fields = []
@@ -225,7 +235,7 @@ python do_package_ipk () {
except KeyError:
(type, value, traceback) = sys.exc_info()
ctrlfile.close()
- bb.utils.unlockfile(lf)
+ unlockfile(lf)
raise bb.build.FuncFailed("Missing field for ipk generation: %s" % value)
# more fields
@@ -262,7 +272,7 @@ python do_package_ipk () {
try:
scriptfile = file(os.path.join(controldir, script), 'w')
except OSError:
- bb.utils.unlockfile(lf)
+ unlockfile(lf)
raise bb.build.FuncFailed("unable to open %s script file for writing." % script)
scriptfile.write(scriptvar)
scriptfile.close()
@@ -273,7 +283,7 @@ python do_package_ipk () {
try:
conffiles = file(os.path.join(controldir, 'conffiles'), 'w')
except OSError:
- bb.utils.unlockfile(lf)
+ unlockfile(lf)
raise bb.build.FuncFailed("unable to open conffiles for writing.")
for f in conffiles_str.split():
conffiles.write('%s\n' % f)
@@ -283,7 +293,7 @@ python do_package_ipk () {
ret = os.system("PATH=\"%s\" %s %s %s" % (bb.data.getVar("PATH", localdata, 1),
bb.data.getVar("IPKGBUILDCMD",d,1), pkg, pkgoutdir))
if ret != 0:
- bb.utils.unlockfile(lf)
+ unlockfile(lf)
raise bb.build.FuncFailed("ipkg-build execution failed")
for script in ["preinst", "postinst", "prerm", "postrm", "control" ]:
@@ -296,7 +306,7 @@ python do_package_ipk () {
os.rmdir(controldir)
except OSError:
pass
- bb.utils.unlockfile(lf)
+ unlockfile(lf)
}
python () {
============================================================
--- conf/sanity.conf 0ca4f223707a3e2792c4eb0b4ab4ada4461ee385
+++ conf/sanity.conf 9ad5f1d9953217df59e03a3c6727b8246f383334
@@ -1,8 +1,8 @@
# Sanity checks for common user misconfigurations
#
# See sanity.bbclass
#
# Expert users can confirm their sanity with "touch conf/sanity.conf"
-BB_MIN_VERSION = "1.8.9"
+BB_MIN_VERSION = "1.8.8"
INHERIT += "sanity"
============================================================
--- packages/directfb/directfb_1.1.0.bb 1af7bf22ffbfcbc869a08e6664c2dde2ff16c7d2
+++ packages/directfb/directfb_1.1.0.bb b13ed5a2cee07ae6410cd0eddde2ccbd14dd6b79
@@ -7,7 +7,7 @@ DEPENDS = "jpeg libpng freetype zlib tsl
LICENSE = "LGPL"
HOMEPAGE = "http://directfb.org"
DEPENDS = "jpeg libpng freetype zlib tslib"
-PR = "r1"
+PR = "r2"
RV = "1.1-0"
SRC_URI = " \
@@ -37,6 +37,8 @@ do_stage() {
do_stage() {
autotools_stage_all
+ # fix breakage introduced with the fix-includes patch, it seems that directfb examples is the only app that looks in the wrong location :/
+ ln -sf ${STAGING_LIBDIR} ${STAGING_LIBDIR}/directfb
}
do_install() {
#
# mt diff -rb0dc261f9674aecabb4a43c73a328aaba4ec338a -r5f7726df2e142e360d9217ff5a131230d200e19d
#
#
#
# add_file "packages/linux/linux-2.6.23/leds-cpu-activity-powerpc.patch"
# content [5bcbc4e24f3eba05099d47aaba131a41f9b58bdc]
#
# patch "packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig"
# from [e13b56cb233e5f3d8f3f318416074a901d61bca3]
# to [cf4a868ba0d67c665cbdb50b00aad66a166e803a]
#
============================================================
--- packages/linux/linux-2.6.23/leds-cpu-activity-powerpc.patch 5bcbc4e24f3eba05099d47aaba131a41f9b58bdc
+++ packages/linux/linux-2.6.23/leds-cpu-activity-powerpc.patch 5bcbc4e24f3eba05099d47aaba131a41f9b58bdc
@@ -0,0 +1,46 @@
+Index: linux-2.6.23/arch/powerpc/kernel/idle.c
+===================================================================
+--- linux-2.6.23.orig/arch/powerpc/kernel/idle.c 2007-10-09 22:31:38.000000000 +0200
++++ linux-2.6.23/arch/powerpc/kernel/idle.c 2007-12-05 11:34:39.000000000 +0100
+@@ -19,6 +19,7 @@
+ * 2 of the License, or (at your option) any later version.
+ */
+
++#include <linux/leds.h>
+ #include <linux/sched.h>
+ #include <linux/kernel.h>
+ #include <linux/smp.h>
+@@ -50,6 +51,12 @@
+ __setup("powersave=off", powersave_off);
+
+ /*
++ * CPU activity indicator.
++ */
++void (*leds_idle)(int is_idle);
++EXPORT_SYMBOL(leds_idle);
++
++/*
+ * The body of the idle task.
+ */
+ void cpu_idle(void)
+@@ -59,6 +66,8 @@
+
+ set_thread_flag(TIF_POLLING_NRFLAG);
+ while (1) {
++ if (leds_idle)
++ leds_idle(1);
+ while (!need_resched() && !cpu_should_die()) {
+ ppc64_runlatch_off();
+
+@@ -92,8 +101,11 @@
+ ppc64_runlatch_on();
+ if (cpu_should_die())
+ cpu_die();
++ if (leds_idle)
++ leds_idle(0);
+ preempt_enable_no_resched();
+ schedule();
++
+ preempt_disable();
+ }
+ }
============================================================
--- packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig e13b56cb233e5f3d8f3f318416074a901d61bca3
+++ packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig cf4a868ba0d67c665cbdb50b00aad66a166e803a
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.23
-# Wed Nov 28 23:32:31 2007
+# Wed Dec 5 10:34:37 2007
#
# CONFIG_PPC64 is not set
@@ -1467,6 +1467,7 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=m
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=m
CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_CPU_ACTIVITY=m
# CONFIG_INFINIBAND is not set
# CONFIG_EDAC is not set
CONFIG_RTC_LIB=y
More information about the Openembedded-commits
mailing list