From b444904395a5b18150bbfeabdbf47c0a699391b5 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Mon, 6 Oct 2008 03:16:30 +0000 Subject: gcc-configure-cross.inc: create the target of the symlink if necessary; fixes build failures of gcc-cross-4.1.2 --- packages/gcc/gcc-configure-cross.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/gcc/gcc-configure-cross.inc b/packages/gcc/gcc-configure-cross.inc index d5800c78ff..aa4174edc4 100644 --- a/packages/gcc/gcc-configure-cross.inc +++ b/packages/gcc/gcc-configure-cross.inc @@ -27,6 +27,7 @@ do_stage_append () { # Fix a few include links so cross builds are happier if [ ! -e ${STAGING_INCDIR}/c++ ]; then mkdir -p ${STAGING_INCDIR} + mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include/c++ ln -sf ${CROSS_DIR}/${TARGET_SYS}/include/c++ \ ${STAGING_INCDIR}/ fi -- cgit v1.2.3 From 46fa34ed209cca96e1ff14a0e93c9fe2e2b94e48 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 6 Oct 2008 09:36:36 +0000 Subject: xf86 video omapfb: add driver for omapfb (currently only has stubs for accell points) --- packages/xorg-driver/xf86-video-omapfb_git.bb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 packages/xorg-driver/xf86-video-omapfb_git.bb diff --git a/packages/xorg-driver/xf86-video-omapfb_git.bb b/packages/xorg-driver/xf86-video-omapfb_git.bb new file mode 100644 index 0000000000..c116f64483 --- /dev/null +++ b/packages/xorg-driver/xf86-video-omapfb_git.bb @@ -0,0 +1,11 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- OMAP display driver" + +SRCREV = "eb05e4446877409b349d8f9ede35052cc7a3432b" +PV = "0.0.1+${PR}+git${SRCREV}" + +SRC_URI = "git://git.pingu.fi/xf86-video-omapfb.git;protocol=http" + +S = "${WORKDIR}/git" + -- cgit v1.2.3 From f1c06fce7adcd0882e326ca5989a91c3c58d4f86 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 6 Oct 2008 12:49:05 +0000 Subject: package bbclass: add an 'allow_links' param to get symlinks packaged, usefull for splitting out libraries --- classes/package.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/package.bbclass b/classes/package.bbclass index f740906c52..a12bfb0a21 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -21,7 +21,7 @@ def legitimize_package_name(s): # Remaining package name validity fixes return s.lower().replace('_', '-').replace('@', '+').replace(',', '+').replace('/', '-') -def do_split_packages(d, root, file_regex, output_pattern, description, postinst=None, recursive=False, hook=None, extra_depends=None, aux_files_pattern=None, postrm=None, allow_dirs=False, prepend=False, match_path=False, aux_files_pattern_verbatim=None): +def do_split_packages(d, root, file_regex, output_pattern, description, postinst=None, recursive=False, hook=None, extra_depends=None, aux_files_pattern=None, postrm=None, allow_dirs=False, prepend=False, match_path=False, aux_files_pattern_verbatim=None, allow_links=False): """ Used in .bb files to split up dynamically generated subpackages of a given package, usually plugins or modules. @@ -70,7 +70,7 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst continue f = os.path.join(dvar + root, o) mode = os.lstat(f).st_mode - if not (stat.S_ISREG(mode) or (allow_dirs and stat.S_ISDIR(mode))): + if not (stat.S_ISREG(mode) or (allow_links and stat.S_ISLNK(mode)) or (allow_dirs and stat.S_ISDIR(mode))): continue on = legitimize_package_name(m.group(1)) pkg = output_pattern % on -- cgit v1.2.3 From b0bec74f38abf5f6396c85b9c504687190ee5bb4 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 6 Oct 2008 13:00:09 +0000 Subject: opencv: split libraries into seperate packages --- packages/opencv/opencv_1.0.0.bb | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/packages/opencv/opencv_1.0.0.bb b/packages/opencv/opencv_1.0.0.bb index 3c442dd9ec..5b6450eca4 100644 --- a/packages/opencv/opencv_1.0.0.bb +++ b/packages/opencv/opencv_1.0.0.bb @@ -4,7 +4,7 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "GPLv2" -PR = "r1" +PR = "r2" DEPENDS = "libtool swig swig-native python jpeg zlib libpng tiff glib-2.0" #RDEPENDS = "python jpeg zlib libpng tiff glib-2.0" @@ -30,9 +30,12 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/opencvlibrary/opencv-${PV}.tar.gz \ file://debian/300_fix_segfault_in_window_gtk.diff;patch=1 \ " -inherit autotools pkgconfig +inherit distutils-base autotools pkgconfig -EXTRA_OECONF = "--disable-debug --disable-apps" +EXTRA_OECONF = "--disable-debug --without-python --disable-apps az_python_cspec=${STAGING_INCDIR}/${PYTHON_DIR}" + +export BUILD_SYS +export HOST_SYS do_configure() { gnu-configize @@ -40,25 +43,25 @@ do_configure() { oe_runconf } +PACKAGES += "python-opencv" -PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-dbg python-opencv" - -FILES_${PN} = "${libdir}/*.so*" -# ${libdir}/libcv.so* \ -# ${libdir}/libcvaux.so* \ -# ${libdir}/libcxcore.so* \ -# ${libdir}/libhighgui.so* \ -# ${libdir}/libml.so* " +python populate_packages_prepend () { + cv_libdir = bb.data.expand('${libdir}', d) + cv_libdir_dbg = bb.data.expand('${libdir}/.debug', d) + do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) + do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') + do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') + do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) +} -FILES_${PN}-dev += " ${libdir}/*.la " FILES_${PN}-doc += "${datadir}/opencv/" -FILES_${PN}-dbg += "${libdir}/.debug/" +FILES_${PN} = "${bindir}" +FILES_${PN}-dbg += "${libdir}/.debug" +FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig" DESCRIPTION_python-opencv = "Python bindings to opencv" FILES_python-opencv = "${libdir}/*/site-packages/*" -RDEPENDS_python-opencv = "python-core opencv" - -LEAD_SONAME = "libcv.so" +RDEPENDS_python-opencv = "python-core" do_stage() { autotools_stage_all -- cgit v1.2.3 From 64597df9298f6da5eb8830ebddd6626212d3eba5 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Mon, 6 Oct 2008 14:07:03 +0000 Subject: cacao: Removed binutils from DEPENDS and --enable-disassembler from configure arguments --- packages/cacao/cacao.inc | 3 +-- packages/cacao/cacao_0.99.3.bb | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/cacao/cacao.inc b/packages/cacao/cacao.inc index 9c10ee155a..7df6c3712e 100644 --- a/packages/cacao/cacao.inc +++ b/packages/cacao/cacao.inc @@ -4,7 +4,7 @@ LICENSE = "GPL" PRIORITY = "optional" SECTION = "interpreters" -DEPENDS = "zlib libtool classpath binutils cacaoh-native virtual/javac-native" +DEPENDS = "zlib libtool classpath cacaoh-native virtual/javac-native" # Avoid version number here, otherwise dpkg will expect a package name # and cannot be satisfied with a package that provides classpath. @@ -18,7 +18,6 @@ inherit java autotools update-alternatives EXTRA_OECONF = "\ ${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']} \ --enable-debug \ - --enable-disassembler \ --with-vm-zip=${datadir}/cacao/vm.zip \ --with-cacaoh=${STAGING_BINDIR_NATIVE}/cacaoh-${PV} \ --with-build-java-runtime-library-classes=${STAGING_DATADIR}/classpath/glibj.zip \ diff --git a/packages/cacao/cacao_0.99.3.bb b/packages/cacao/cacao_0.99.3.bb index 2823a9be31..b2f5801369 100644 --- a/packages/cacao/cacao_0.99.3.bb +++ b/packages/cacao/cacao_0.99.3.bb @@ -1,6 +1,6 @@ require cacao.inc -PR = "r4" +PR = "r5" SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2 \ file://cacao-codegen-arm1.patch;patch=1 \ -- cgit v1.2.3 From 2bc6da810a3950169953c72737f8263afffbb2e8 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 6 Oct 2008 19:13:20 +0000 Subject: build-feeds.sh: merge recent Opie additions from stable branch * Add task-opie-apps * Add packages added to build-feeds.sh in stable, minus packages already included via tasks --- contrib/angstrom/build-feeds.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index 2b00692625..7fc40a0a64 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -70,7 +70,12 @@ do xserver-kdrive xserver-xorg \ xf86-video-fbdev xf86-video-ati xf86-video-vesa \ xf86-input-evdev xf86-input-keyboard xf86-input-mouse \ - task-opie task-opie-all \ + task-opie task-opie-games task-opie-apps task-opie-all \ + konqueror-embedded ubahnnav freenote inkwp opie-notes mileage pocketcellar timesleuth zgscore \ + zlapspeed zuc zddice camera-assistant slcalc sliderulez resistorui qpe-nmap \ + atomic checkers fish glider hexatrolic icebloxx labyrinth mahjongg maki nmm pairs pdamaze \ + pipeman shisensho sokoban tron win4 zauralign ziq zrev7 zsubhunt ztappy zudoku iaimaster \ + qmatrix qfish2 froot \ task-openmoko-base task-openmoko-debug task-openmoko-examples task-openmoko-feed task-openmoko-games task-openmoko-linux task-openmoko-native-sdk task-openmoko-net task-openmoko-phone task-openmoko-pim task-openmoko-ui \ gsm0710muxd frameworkd zhone \ gnome-games \ -- cgit v1.2.3 From 821b74d1c59559496ed7e7e86531fe3f76f4dade Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Mon, 6 Oct 2008 19:14:33 +0000 Subject: gcc-4.3.2: use multilib on sh4, so kernel can compile without fpu registers * add patch gcc-4.2.3-linux-multilib-fix.patch used by various other linux distributions * put the mulitlib config in gcc-cross4.inc because gcc-3 works without that * need to bump PR because we pushed in earlier changes on sh4 without bumping --- packages/gcc/gcc-4.3.2.inc | 2 +- .../gcc-4.3.2/gcc-4.2.3-linux-multilib-fix.patch | 23 ++++++++++++++++++++++ packages/gcc/gcc-cross4.inc | 2 ++ packages/gcc/gcc-cross_4.3.2.bb | 2 +- 4 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 packages/gcc/gcc-4.3.2/gcc-4.2.3-linux-multilib-fix.patch diff --git a/packages/gcc/gcc-4.3.2.inc b/packages/gcc/gcc-4.3.2.inc index 21c08ffccc..74ed254694 100644 --- a/packages/gcc/gcc-4.3.2.inc +++ b/packages/gcc/gcc-4.3.2.inc @@ -60,8 +60,8 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " SRC_URI_append_sh4 = " file://sh_unwind.patch;patch=1 \ + file://gcc-4.2.3-linux-multilib-fix.patch;patch=1 \ " - # Language Overrides FORTRAN = "" JAVA = "" diff --git a/packages/gcc/gcc-4.3.2/gcc-4.2.3-linux-multilib-fix.patch b/packages/gcc/gcc-4.3.2/gcc-4.2.3-linux-multilib-fix.patch new file mode 100644 index 0000000000..81522a8f57 --- /dev/null +++ b/packages/gcc/gcc-4.3.2/gcc-4.2.3-linux-multilib-fix.patch @@ -0,0 +1,23 @@ +Change gcc build : Enable m4 and m4-nofpu (needed for kernel) for sh4-gnu-linux + +Signed-off-by: Carl Shaw + +Index: gcc/gcc/config.gcc +=================================================================== +--- gcc.orig/gcc/config.gcc 2008-07-18 10:37:54.000000000 +0100 ++++ gcc/gcc/config.gcc 2008-07-18 11:00:42.000000000 +0100 +@@ -2097,11 +2097,12 @@ + if test x${sh_multilibs} = x ; then + case ${target} in + sh64-superh-linux* | \ +- sh[1234]*) sh_multilibs=${sh_cpu_target} ;; + sh64* | sh5*) sh_multilibs=m5-32media,m5-32media-nofpu,m5-compact,m5-compact-nofpu,m5-64media,m5-64media-nofpu ;; +- sh-superh-*) sh_multilibs=m4,m4-single,m4-single-only,m4-nofpu ;; ++ sh-superh-* | \ ++ sh4-*-linux*) sh_multilibs=m4,m4-nofpu ;; + sh*-*-linux*) sh_multilibs=m1,m3e,m4 ;; + sh*-*-netbsd*) sh_multilibs=m3,m3e,m4 ;; ++ sh[1234]*) sh_multilibs=${sh_cpu_target} ;; + *) sh_multilibs=m1,m2,m2e,m4,m4-single,m4-single-only,m2a,m2a-single ;; + esac + if test x$with_fp = xno; then diff --git a/packages/gcc/gcc-cross4.inc b/packages/gcc/gcc-cross4.inc index 3d3403737a..77a55968fa 100644 --- a/packages/gcc/gcc-cross4.inc +++ b/packages/gcc/gcc-cross4.inc @@ -1,3 +1,5 @@ require gcc-cross.inc DEPENDS += "gmp-native mpfr-native" + +EXTRA_OECONF_append_sh4 = " --with-multilib-list=m4,m4-nofpu " diff --git a/packages/gcc/gcc-cross_4.3.2.bb b/packages/gcc/gcc-cross_4.3.2.bb index 526ec1508b..18d5abd32e 100644 --- a/packages/gcc/gcc-cross_4.3.2.bb +++ b/packages/gcc/gcc-cross_4.3.2.bb @@ -1,4 +1,4 @@ -PR = "r4" +PR = "r5" require gcc-${PV}.inc require gcc-cross4.inc require gcc-configure-cross.inc -- cgit v1.2.3 From 36bb8829f31eebca4b864a9d8df604fdd3d0fbf0 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 6 Oct 2008 19:14:34 +0000 Subject: task-opie-all: remove opie-cardmon (replaced by opie-cardapplet) --- packages/tasks/task-opie-all.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tasks/task-opie-all.bb b/packages/tasks/task-opie-all.bb index 47d2eba229..9f1403f050 100644 --- a/packages/tasks/task-opie-all.bb +++ b/packages/tasks/task-opie-all.bb @@ -14,7 +14,7 @@ PACKAGES = "task-opie-applets task-opie-inputmethods task-opie-styles \ # all OPIE stuff # RDEPENDS_task-opie-applets = "opie-aboutapplet opie-autorotateapplet opie-batteryapplet \ - opie-bluetoothapplet opie-brightnessapplet opie-cardmon \ + opie-bluetoothapplet opie-brightnessapplet \ opie-clipboardapplet opie-clockapplet opie-homeapplet \ opie-irdaapplet opie-lockapplet opie-logoutapplet \ opie-mailapplet opie-memoryapplet opie-multikeyapplet \ -- cgit v1.2.3 From 9f9adf552199cf3b752248eebd2f1f63b88136fc Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Mon, 6 Oct 2008 19:46:21 +0000 Subject: classpath-native 0.97: Completed patch that was not supposed to be committed in the first place. --- packages/classpath/classpath-native_0.97.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/classpath/classpath-native_0.97.2.bb b/packages/classpath/classpath-native_0.97.2.bb index 3046ff44c1..81ffad3b14 100644 --- a/packages/classpath/classpath-native_0.97.2.bb +++ b/packages/classpath/classpath-native_0.97.2.bb @@ -21,7 +21,7 @@ do_unpackpost() { mv external/w3c_dom/org/w3c/dom/html2 \ external/w3c_dom/org/w3c/dom/html - find gnu/classpath/examples/html gnu/xml/dom/html2 external/w3c_dom/org/w3c/dom/html -name "*.java" \ + find examples/gnu/classpath/examples/html gnu/xml/dom/html2 external/w3c_dom/org/w3c/dom/html -name "*.java" \ -exec sed -i -e"s|org.w3c.dom.html2|org.w3c.dom.html|" {} \; sed -i -e"s|org/w3c/dom/html2|org/w3c/dom/html|" external/w3c_dom/Makefile.am -- cgit v1.2.3