From 402f1f697406d4d1a844a6c6b7736435053d69c6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 17 Jun 2009 11:17:23 +0200 Subject: libpcre: fix staging and packaging --- recipes/libpcre/libpcre_7.6.bb | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/recipes/libpcre/libpcre_7.6.bb b/recipes/libpcre/libpcre_7.6.bb index eb5af03db0..aa038c6e95 100644 --- a/recipes/libpcre/libpcre_7.6.bb +++ b/recipes/libpcre/libpcre_7.6.bb @@ -5,7 +5,7 @@ provides a POSIX calling interface to PCRE; the regular expressions \ themselves still follow Perl syntax and semantics. The header file for \ the POSIX-style functions is called pcreposix.h." SECTION = "devel" -PR = "r3" +PR = "r4" LICENSE = "BSD" SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \ file://pcre-cross.patch;patch=1" @@ -17,7 +17,6 @@ inherit autotools binconfig PARALLEL_MAKE = "" -LEAD_SONAME = "libpcre.so" CFLAGS_append = " -D_REENTRANT" CXXFLAGS_powerpc += "-lstdc++" EXTRA_OECONF = " --with-link-size=2 --enable-newline-is-lf --with-match-limit=10000000 --enable-rebuild-chartables --enable-utf8" @@ -40,13 +39,19 @@ do_compile () { } do_stage () { - oe_libinstall -a -so libpcre ${STAGING_LIBDIR} - oe_libinstall -a -so libpcreposix ${STAGING_LIBDIR} - install -m 0644 pcre.h ${STAGING_INCDIR}/ - install -m 0644 pcreposix.h ${STAGING_INCDIR}/ - install -d ${STAGING_BINDIR_NATIVE} + autotools_stage_all + install -d ${STAGING_BINDIR_NATIVE} install -m 0755 ${S}/dftables ${STAGING_BINDIR_NATIVE}/ } -FILES_${PN} = "${libdir}/lib*.so.*" +python populate_packages_prepend () { + pcre_libdir = bb.data.expand('${libdir}', d) + pcre_libdir_dbg = bb.data.expand('${libdir}/.debug', d) + do_split_packages(d, pcre_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'libpcre %s development package', extra_depends='${PN}-dev', allow_links=True) + do_split_packages(d, pcre_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'libpcre %s development package', extra_depends='${PN}-dev') + do_split_packages(d, pcre_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'libpcre %s development package', extra_depends='${PN}-dev') + do_split_packages(d, pcre_libdir, '^lib(.*)\.so\.*', 'lib%s', 'libpcre %s library', extra_depends='', allow_links=True) +} + +FILES_${PN} = "${libdir}/libpcre.so.*" FILES_${PN}-dev += "${bindir}/*" -- cgit v1.2.3 From 3ac4bce80157a1a72d2f8e158956525c9567b236 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 17 Jun 2009 11:39:48 +0200 Subject: gnote: add 0.5.0 --- conf/checksums.ini | 4 ++++ recipes/gnome/gnote_0.5.0.bb | 8 ++++++++ 2 files changed, 12 insertions(+) create mode 100644 recipes/gnome/gnote_0.5.0.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 2f9c8289ab..0d23596456 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -8466,6 +8466,10 @@ sha256=77cb4bd39a4cec2aa3d61b0519134f9e4a65613960b3b3ee34dd2452d5e12ba7 md5=905a8df3513a519096bcf7d8efc35118 sha256=f08d0f214db875eac602bec37b20042f0ee4f14427f9559477a040ef39003538 +[http://ftp.gnome.org/pub/GNOME/sources/gnote/0.5/gnote-0.5.0.tar.bz2] +md5=ca9e67a92945af7230eae72b2e8430ec +sha256=19a1f79c42b37ee3c90ba6298442b52438f1c67d311ebd33db72210cee2d99d2 + [ftp://ftp.gnu.org/gnu/ghostscript/gnu-ghostscript-8.16.tar.gz] md5=c42dfaebc37fe81eab0b5676b124ab63 sha256=417922d35e66ee90cf93cf3e93fdf281ec6b92de4f7436c9c1a97c0cc35b94a8 diff --git a/recipes/gnome/gnote_0.5.0.bb b/recipes/gnome/gnote_0.5.0.bb new file mode 100644 index 0000000000..cc11022b7c --- /dev/null +++ b/recipes/gnome/gnote_0.5.0.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "Note taking application" +LICENSE = "GPL" + +DEPENDS = "libpcre libgnomeui gconf-dbus gtkmm boost" + +inherit gnome + +FILES_${PN}-dbg += "${libdir}/gnote/*/*/.debug" -- cgit v1.2.3 From 19f35a34bc1c98e684b96306b377d230e367c49f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 17 Jun 2009 11:40:04 +0200 Subject: gnome-bluetooth: bump SRCREV --- recipes/gnome/gnome-bluetooth_git.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/recipes/gnome/gnome-bluetooth_git.bb b/recipes/gnome/gnome-bluetooth_git.bb index de11874fab..23c4ca92ac 100644 --- a/recipes/gnome/gnome-bluetooth_git.bb +++ b/recipes/gnome/gnome-bluetooth_git.bb @@ -11,12 +11,13 @@ SRC_URI = "git://git.gnome.org/gnome-bluetooth;protocol=git \ S = "${WORKDIR}/git" -SRCREV = "097aef044ced5937dd7e288bfee58b6138939117" +SRCREV = "93fd8de2cc717b96ad719ab2fb5ed38b8a0fc707" PV = "2.27.5" +PR = "r2" PR_append = "+gitr${SRCREV}" -DEPENDS = "obexd obex-data-server gconf-dbus gtk+ dbus-glib libunique libnotify hal bluez4 gnome-keyring" -RRECOMMENDS_${PN} += "obexd obex-data-server" +DEPENDS = "obexd gconf-dbus gtk+ dbus-glib libunique libnotify hal bluez4 gnome-keyring" +RRECOMMENDS_${PN} += "obexd" RCONFLICTS_${PN} = "bluez-gnome" do_configure_prepend() { -- cgit v1.2.3 From f6adf3a14d2af0926e3526e4f1e26f01b851bc45 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Fri, 12 Jun 2009 13:49:22 +0900 Subject: preferred-xorg-versions-X11R7.4.inc: pin xextproto-native and xtrans-native * xextproto-native: 7.0.3 * xtrans: 1.2.1 --- conf/distro/include/preferred-xorg-versions-X11R7.4.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc index 46fa8d496a..21f9758f0e 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc @@ -195,6 +195,7 @@ PREFERRED_VERSION_xtrans ?= "1.2.1" # This should be here but is needed until bitbake can do # versioned depends PREFERRED_VERSION_mesa ?= "7.2" +PREFERRED_VERSION_xtrans-native ?= "1.2.1" # proto PREFERRED_VERSION_applewmproto ?= "1.0.3" @@ -218,6 +219,7 @@ PREFERRED_VERSION_videoproto ?= "2.2.2" PREFERRED_VERSION_windowswmproto ?= "1.0.3" PREFERRED_VERSION_xmiscproto ?= "1.1.2" PREFERRED_VERSION_xextproto ?= "7.0.3" +PREFERRED_VERSION_xextproto-native ?= "7.0.3" PREFERRED_VERSION_xf86dgaproto ?= "2.0.3" PREFERRED_VERSION_xf86driproto ?= "2.0.4" PREFERRED_VERSION_xf86miscproto ?= "0.9.2" -- cgit v1.2.3 From 75bef6ce9fd468deb44a16e47fef4fc408448766 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 17 Jun 2009 19:52:05 +0900 Subject: kakasi: remove S definition from native recipe * as suggested by recipe_sanity * has probably become unnecessary with the introduction of BPN --- recipes/kakasi/kakasi-native_2.3.4.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes/kakasi/kakasi-native_2.3.4.bb b/recipes/kakasi/kakasi-native_2.3.4.bb index 86a4c81b44..18f0061cfe 100644 --- a/recipes/kakasi/kakasi-native_2.3.4.bb +++ b/recipes/kakasi/kakasi-native_2.3.4.bb @@ -2,8 +2,6 @@ require kakasi.inc inherit native -S = "${WORKDIR}/kakasi-${PV}" - do_stage() { install src/mkkanwa ${STAGING_BINDIR} } -- cgit v1.2.3 From 47de8a5f73ff55914745953704a73f3c33ff49a2 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 17 Jun 2009 19:56:15 +0900 Subject: uim: remove S definition from native recipe * as suggested by recipe_sanity * has probably become unnecessary with the introduction of BPN --- recipes/uim/uim-native_1.3.1.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes/uim/uim-native_1.3.1.bb b/recipes/uim/uim-native_1.3.1.bb index f23f6bd945..3404a36ab5 100644 --- a/recipes/uim/uim-native_1.3.1.bb +++ b/recipes/uim/uim-native_1.3.1.bb @@ -3,6 +3,4 @@ DEPENDS = "gtk+ anthy intltool-native" inherit native autotools pkgconfig PR = "r2" -S = "${WORKDIR}/uim-${PV}" - EXTRA_OECONF += "--disable-xim" -- cgit v1.2.3 From 1f591a5ffd69f6c99f294c217bec8ad12b137ab9 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 17 Jun 2009 13:55:21 +0200 Subject: fbprogress: make it work better - images are kept in /usr/share/fbprogress - proper framebuffer is used - include paths and libraries to link with are given in recipe instead of makefile Signed-off-by: Marcin Juszkiewicz --- recipes/fbprogress/fbprogress_1.1.bb | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/recipes/fbprogress/fbprogress_1.1.bb b/recipes/fbprogress/fbprogress_1.1.bb index 8d603b8a3e..855d1ca3d4 100644 --- a/recipes/fbprogress/fbprogress_1.1.bb +++ b/recipes/fbprogress/fbprogress_1.1.bb @@ -3,8 +3,8 @@ AUTHOR = "Angel Roman" HOMEPAGE = "http://www.buglabs.net/" LICENSE = "GPL" DEPENDS = "freetype zlib virtual/kernel" -SRCREV = "9118" -PR = "r1" +SRCREV = "9405" +PR = "r2" SRC_URI = "svn://svn.buglabs.net/bug/trunk;module=com.buglabs.bug.native.fbprogress;proto=svn \ file://fbprogress-init" @@ -13,14 +13,17 @@ S = "${WORKDIR}/com.buglabs.bug.native.fbprogress" inherit update-rc.d -EXTRA_OEMAKE = "BUG_LINUX_SRC=${STAGING_KERNEL_DIR}" +TARGET_CXXFLAGS += "-I${STAGING_INCDIR}/freetype2 -I${STAGING_KERNEL_DIR}/include" +TARGET_LDFLAGS += "-L${STAGING_LIBDIR} -lfreetype -lz" do_install() { - install -d ${D}/${sysconfdir}/fbprogress - install -m 0644 ${S}/images/* ${D}/${sysconfdir}/fbprogress/ - install -d ${D}${layout_bindir} - install -m 0755 fbprogress ${D}${layout_bindir} - install -m 0755 fbprogress.sh ${D}${layout_bindir} + install -d ${D}/${datadir}/fbprogress + install -m 0644 ${S}/images/* ${D}/${datadir}/fbprogress/ + + install -d ${D}${bindir} + install -m 0755 fbprogress ${D}${bindir} + install -m 0755 fbprogress.sh ${D}${bindir} + install -d ${D}/${sysconfdir}/init.d install -m 0755 ${WORKDIR}/fbprogress-init ${D}/${sysconfdir}/init.d/fbprogress } -- cgit v1.2.3 From 35e7b34d3b5b96ed11bc7ed6b2a5d08e6183d8a3 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 3 Jun 2009 01:25:43 +0000 Subject: fix for MACHINE_KERNEL_PR stuff This patch unbreaks current behaviour which was introduced by MACHINE_KERNEL_PR variable. As most of target machines do not use it they have PR with broken value (set to "r0" instead of value in recipe). I took other way which makes both types of users happy -- those with MACHINE_KERNEL_PR in use and those without it. By default we set M_K_PR to empty string instead of "r0" - this allows to check is it set at all or not. If it is set then we set PR to this value. Otherwise we ignore existance of that variable and use PR from recipe. Signed-off-by: Marcin Juszkiewicz --- classes/kernel.bbclass | 10 ++++++---- conf/bitbake.conf | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 1323228a74..b18dfab796 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -20,6 +20,12 @@ python __anonymous () { image = bb.data.getVar('INITRAMFS_IMAGE', d, True) if image != '' and image is not None: bb.data.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs', d) + + pr = bb.data.getVar('PR', d, True) + machine_kernel_pr = bb.data.getVar('MACHINE_KERNEL_PR', d, True) + + if machine_kernel_pr: + bb.data.setVar('PR', machine_kernel_pr, d) } INITRAMFS_IMAGE ?= "" @@ -64,10 +70,6 @@ export CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "tt KERNEL_VERSION = "${@get_kernelversion('${S}')}" KERNEL_MAJOR_VERSION = "${@get_kernelmajorversion('${KERNEL_VERSION}')}" -# A machine.conf or local.conf can increase MACHINE_KERNEL_PR to force -# rebuilds for kernel and external modules -PR = "${MACHINE_KERNEL_PR}" - KERNEL_LOCALVERSION ?= "" # kernels are generally machine specific diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 077e8e1e9a..4f00be73e6 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -164,7 +164,7 @@ P = "${PN}-${PV}" # Define a PR for kernels that machines can override so things like # modules get rebuilt -MACHINE_KERNEL_PR ?= "r0" +MACHINE_KERNEL_PR = "" # Base package name # Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial" -- cgit v1.2.3 From 2064158213d5332f02b1eee5648cbc1ae9cb8930 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 17 Jun 2009 14:14:15 +0200 Subject: checksums.ini: added connman 0.18 and connman-gnome 0.5 --- conf/checksums.ini | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 0d23596456..bf8693d00e 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -3966,6 +3966,10 @@ sha256=73f3b92c0f85ab2bf0f9bb18f928a8b84cacdbb459f3a530df540d4ddf134405 md5=7bc5c89870d47c88f407fcfd666c739d sha256=102bb7a5d329dd6831bc8a923fa0b5d7634efa215e3d15377630d9b738df49da +[http://www.kernel.org/pub/linux/network/connman/connman-0.18.tar.gz] +md5=b58cb56d0403bfafb3972e82a339546c +sha256=923ce04b8ff93aa9eec4df6c822f1c7d35e8aea1ab8680bd0d9a5e4d327dd3c6 + [http://www.kernel.org/pub/linux/network/connman/connman-0.19.tar.gz] md5=3d61c5db55d225c3efbf4c950dc0842f sha256=cc4a4b73d8d7b0e19dd2dd274ba91acb67b14c84fc448a921d1359e25e4d2df0 @@ -4006,6 +4010,10 @@ sha256=d7acac8bc0a38dfcab098137a76f5e9f4ce30ca86e82b26540502658e6b4e4a7 md5=c9a3b384f080ed4cdf139ce9377ef2c8 sha256=d7acac8bc0a38dfcab098137a76f5e9f4ce30ca86e82b26540502658e6b4e4a7 +[http://www.kernel.org/pub/linux/network/connman/connman-gnome-0.5.tar.gz] +md5=0e1c4c25d19cad9b08a216848a320716 +sha256=4d5fe481b444fc3e64fd9caa149dbcd76de166a25733f18fd93da01d2abf5d1c + [http://www.conserver.com/conserver-8.1.14.tar.gz] md5=f7825728e5af8992ed4a99fb560a3df8 sha256=48a9e2f8a02054bc6740ae354433bfa1636a6e726f2d62af22752d7a6103410b -- cgit v1.2.3 From 4c0ec23a5f34d92b679c413aee3bf022bc4df228 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 11 Jun 2009 15:21:00 +0200 Subject: siteinfo.bbclass: add support for via C3 host --- classes/siteinfo.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass index 0221b123f1..e51d7ab8a6 100644 --- a/classes/siteinfo.bbclass +++ b/classes/siteinfo.bbclass @@ -32,7 +32,7 @@ def get_siteinfo_list(d): "arm-linux-uclibc": "endian-little bit-32 common-linux common-uclibc arm-common",\ "arm-linux-uclibcgnueabi": "endian-little bit-32 common-linux common-uclibc arm-common arm-linux-uclibc",\ "avr32-linux-uclibc": "endian-big bit-32 common-linux common-uclibc avr32-common",\ - "bfin-uclinux-uclibc": "endian-little bit-32 common-uclibc bfin-common",\ + "bfin-uclinux-uclibc": "endian-little bit-32 common-uclibc bfin-common",\ "i386-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ "i486-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ "i586-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ @@ -64,6 +64,7 @@ def get_siteinfo_list(d): "sh4-linux": "endian-little bit-32 common-linux common-glibc sh-common",\ "sh4-linux-uclibc": "endian-little bit-32 common-linux common-uclibc sh-common",\ "sparc-linux": "endian-big bit-32 common-linux common-glibc",\ + "viac3-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ "x86_64-linux": "endian-little bit-64 common-linux common-glibc",\ "x86_64-linux-uclibc": "endian-little bit-64 common-linux common-uclibc"} if target in targetinfo: -- cgit v1.2.3 From 40c8b7516530ad65160841f6e79e40475d02d471 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 17 Jun 2009 14:38:33 +0200 Subject: kernel.bbclass: remove not used 'pr' variable - spotten by Koen --- classes/kernel.bbclass | 1 - 1 file changed, 1 deletion(-) diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index b18dfab796..75a9077445 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -21,7 +21,6 @@ python __anonymous () { if image != '' and image is not None: bb.data.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs', d) - pr = bb.data.getVar('PR', d, True) machine_kernel_pr = bb.data.getVar('MACHINE_KERNEL_PR', d, True) if machine_kernel_pr: -- cgit v1.2.3