Re: [oe] [meta-oe][PATCH 5/5] mcnavi: move from meta-oe to meta-efl
On Thu, Oct 18, 2012 at 9:54 PM, Martin Jansa wrote: > * mcnavi depends on ecore, but meta-oe does not depend on meta-efl > * thanks to kergoth for reporting this! > > Signed-off-by: Martin Jansa > --- > {meta-oe => meta-efl}/recipes-navigation/mcnavi/mcnavi_0.3.3.bb | 0 > 1 file changed, 0 insertions(+), 0 deletions(-) > rename {meta-oe => meta-efl}/recipes-navigation/mcnavi/mcnavi_0.3.3.bb (100%) > > diff --git a/meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb > b/meta-efl/recipes-navigation/mcnavi/mcnavi_0.3.3.bb > similarity index 100% > rename from meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb > rename to meta-efl/recipes-navigation/mcnavi/mcnavi_0.3.3.bb > -- > 1.7.12.4 > Just for the admins: Pure move patches do not make it into patchwork (had same with [1]) Andreas [1] https://gitorious.org/schnitzeltony-oe-meta/meta-openembedded/commit/7acc5d92451fb14627736c9099249f8952b5deab ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH 1/5] PACKAGES_DYNAMIC: use regexp not glob
On Thu, Oct 18, 2012 at 9:54 PM, Martin Jansa wrote: > * bitbake uses PACKAGES_DYNAMIC as regexp > ^ could make matching faster (and it will be more clear that we're > expecting regexp not glob) > * made all those last '-' optional, use .* (or nothing) > * use += instead of = in most cases to keep ${PN}-locale from > bitbake.conf:PACKAGES_DYNAMIC = "^${PN}-locale-.*" > > Signed-off-by: Martin Jansa > --- > meta-efl/recipes-efl/efl/evas-generic-loaders.inc | 2 +- > meta-efl/recipes-efl/efl/evas.inc | 2 +- > meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb | 2 +- > meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb| 2 +- > meta-gnome/recipes-gnome/gtk+/gtk+3_3.2.3.bb | 2 +- > meta-gnome/recipes-support/goffice/goffice_0.8.17.bb | 2 +- > meta-initramfs/recipes-devtools/klibc/klibc-utils.inc | 2 +- > meta-oe/recipes-devtools/libcanberra/libcanberra_0.26.bb | 2 +- > meta-oe/recipes-extended/lcdproc/lcdproc5.inc | 2 +- > meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb | 2 +- > meta-oe/recipes-multimedia/libav/libav.inc| 2 +- > meta-oe/recipes-support/freerdp/freerdp.inc | 2 +- > meta-oe/recipes-support/openldap/openldap_2.4.23.bb | 2 +- > meta-oe/recipes-support/pidgin/pidgin.inc | 2 +- > meta-xfce/recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb | 2 +- > meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.10.0.bb | 2 +- > meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.0.bb | 2 +- > 17 files changed, 17 insertions(+), 17 deletions(-) > Some buildhistory results for that? Andreas ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe] devilspie2: initial add 0.24
Signed-off-by: Andreas Müller --- .../recipes-graphics/devilspie/devilspie2_0.24.bb | 30 + .../recipes-graphics/devilspie/files/default.lua | 46 .../devilspie/files/devilspie2.desktop |5 ++ 3 files changed, 81 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-graphics/devilspie/devilspie2_0.24.bb create mode 100644 meta-oe/recipes-graphics/devilspie/files/default.lua create mode 100644 meta-oe/recipes-graphics/devilspie/files/devilspie2.desktop diff --git a/meta-oe/recipes-graphics/devilspie/devilspie2_0.24.bb b/meta-oe/recipes-graphics/devilspie/devilspie2_0.24.bb new file mode 100644 index 000..05311fd --- /dev/null +++ b/meta-oe/recipes-graphics/devilspie/devilspie2_0.24.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "Devilspie2 is a window matching utility, allowing the user to perform scripted actions on windows as they are created" +HOMEPAGE = "http://www.gusnan.se/devilspie2"; +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=00aefaa50aad75c21367df66102d542c \ +file://GPL3.txt;md5=d32239bcb673463ab874e80d47fae504" + +DEPENDS = "gtk+ glib-2.0 libwnck lua5.1 virtual/libx11" + +SRC_URI = " \ + http://www.gusnan.se/devilspie2/download/devilspie2_${PV}-src.tar.gz \ + file://default.lua \ + file://devilspie2.desktop \ +" +SRC_URI[md5sum] = "90b354662659e2922bd051fdde3b0971" +SRC_URI[sha256sum] = "9c94fa13ed8c0bf6914fdda513e21a4bd527821b97a53d8004168a8d465a646a" + +inherit pkgconfig + +do_compile() { + export GTK2=1 + oe_runmake CC="${CC}" CPPFLAGS="${CPPFLAGS}" LDFLAGS=" -ldl -lm ${LDFLAGS}" +} + +do_install() { + oe_runmake DESTDIR="${D}" PREFIX="${prefix}" install + install -d ${D}/${sysconfdir}/devilspie2 + install -m 644 ${WORKDIR}/default.lua ${D}/${sysconfdir}/devilspie2 + install -d ${D}/${sysconfdir}/xdg/autostart + install -m 644 ${WORKDIR}/devilspie2.desktop ${D}/${sysconfdir}/xdg/autostart +} diff --git a/meta-oe/recipes-graphics/devilspie/files/default.lua b/meta-oe/recipes-graphics/devilspie/files/default.lua new file mode 100644 index 000..22a17fe --- /dev/null +++ b/meta-oe/recipes-graphics/devilspie/files/default.lua @@ -0,0 +1,46 @@ +-- Copyright (c) 2012 Andreas Müller +-- +-- this is an example +-- * undecorating all windows opened maximized +-- * maximizing and undecorating all appplication's windows in apps_list +-- for further information see +-- http://www.gusnan.se/devilspie2/manual.php + +wnd_type = get_window_type() + +if(wnd_type == "WINDOW_TYPE_NORMAL") then + + -- add only applications you want maximized+undecorated and + -- which don't keep maximized state + apps_list = + { + "Terminal", + "ristretto", + "xarchiver", + } + + app_name = get_application_name() + + -- to have some informational output, start devilspie2 with --debug + -- option and uncomment the following lines: + + --debug_print ("Window Name: " .. get_window_name()) + --debug_print ("Application name: " .. app_name) + --debug_print ("window-type: " .. wnd_type) + + -- undecorate all windows starting maximized + if (get_window_is_maximized()) then + undecorate_window() + + -- maximize/undecorate all windows in apps_list + -- (unfortunately for some also their settings) + else + for line, str in ipairs(apps_list) do + if (string.find(app_name, str)) then + maximize() + undecorate_window() + break + end + end + end +end diff --git a/meta-oe/recipes-graphics/devilspie/files/devilspie2.desktop b/meta-oe/recipes-graphics/devilspie/files/devilspie2.desktop new file mode 100644 index 000..e34e881 --- /dev/null +++ b/meta-oe/recipes-graphics/devilspie/files/devilspie2.desktop @@ -0,0 +1,5 @@ +[Desktop Entry] +Type=Application +Name=Devilspie2 +Exec=devilspie2 -f /etc/devilspie2 + -- 1.7.4.4 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [PATCH] atk: update to 2.6.0
Signed-off-by: Phil Blundell --- meta/recipes-support/atk/{atk_2.4.0.bb => atk_2.6.0.bb} |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-support/atk/{atk_2.4.0.bb => atk_2.6.0.bb} (75%) diff --git a/meta/recipes-support/atk/atk_2.4.0.bb b/meta/recipes-support/atk/atk_2.6.0.bb similarity index 75% rename from meta/recipes-support/atk/atk_2.4.0.bb rename to meta/recipes-support/atk/atk_2.6.0.bb index 4a2d853..f9cefde 100644 --- a/meta/recipes-support/atk/atk_2.4.0.bb +++ b/meta/recipes-support/atk/atk_2.6.0.bb @@ -13,9 +13,9 @@ DEPENDS = "glib-2.0" inherit autotools gtk-doc pkgconfig -SRC_URI = "http://download.gnome.org/sources/atk/2.4/${BPN}-${PV}.tar.xz"; -SRC_URI[md5sum] = "2184a140f71d50276669d6eda5cce5db" -SRC_URI[sha256sum] = "091e9ce975a9fbbc7cd8fa64c9c389ffb7fa6cdde58b6d5c01b2c267093d888d" +SRC_URI = "http://download.gnome.org/sources/atk/2.6/${BPN}-${PV}.tar.xz"; +SRC_URI[md5sum] = "6b34e2a63dda4429b5692be7ca3aa5bf" +SRC_URI[sha256sum] = "eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f" BBCLASSEXTEND = "native" -- 1.7.10.4 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 2/2] sshfs-fuse : Import recipe from Openembedded Classic.
From: Philip Balister Signed-off-by: Philip Balister --- .../sshfs-fuse/sshfs-fuse_2.4.bb | 19 +++ 1 files changed, 19 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-connectivity/sshfs-fuse/sshfs-fuse_2.4.bb diff --git a/meta-oe/recipes-connectivity/sshfs-fuse/sshfs-fuse_2.4.bb b/meta-oe/recipes-connectivity/sshfs-fuse/sshfs-fuse_2.4.bb new file mode 100644 index 000..83d5c87 --- /dev/null +++ b/meta-oe/recipes-connectivity/sshfs-fuse/sshfs-fuse_2.4.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "This is a filesystem client based on the SSH File Transfer Protocol using FUSE." +AUTHOR = "Miklos Szeredi " +HOMEPAGE = "http://fuse.sourceforge.net/sshfs.html"; +SECTION = "console/network" +PRIORITY = "optional" +LICENSE = "GPLv2" +DEPENDS = "glib-2.0 fuse" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/${P}.tar.gz" +S = "${WORKDIR}/${P}" + +inherit autotools + +FILES_${PN} += "${libdir}/sshnodelay.so" + +SRC_URI[md5sum] = "3c7c3647c52ce84d09486f1da3a3ce24" +SRC_URI[sha256sum] = "3c93ba8522568093c94ff9c5a3763929380dd229365d905769ff82475d774dd1" + -- 1.7.7.6 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/2] fuse : Update to version 2.9.2.
From: Philip Balister Bug fix release. Signed-off-by: Philip Balister --- .../fuse/fuse-2.9.1/gold-unversioned-symbol.patch | 60 .../fuse/fuse-2.9.2/gold-unversioned-symbol.patch | 60 meta-oe/recipes-support/fuse/fuse_2.9.1.bb | 33 --- meta-oe/recipes-support/fuse/fuse_2.9.2.bb | 33 +++ 4 files changed, 93 insertions(+), 93 deletions(-) delete mode 100644 meta-oe/recipes-support/fuse/fuse-2.9.1/gold-unversioned-symbol.patch create mode 100644 meta-oe/recipes-support/fuse/fuse-2.9.2/gold-unversioned-symbol.patch delete mode 100644 meta-oe/recipes-support/fuse/fuse_2.9.1.bb create mode 100644 meta-oe/recipes-support/fuse/fuse_2.9.2.bb diff --git a/meta-oe/recipes-support/fuse/fuse-2.9.1/gold-unversioned-symbol.patch b/meta-oe/recipes-support/fuse/fuse-2.9.1/gold-unversioned-symbol.patch deleted file mode 100644 index 8ee97df..000 --- a/meta-oe/recipes-support/fuse/fuse-2.9.1/gold-unversioned-symbol.patch +++ /dev/null @@ -1,60 +0,0 @@ -Index: fuse-2.8.6/lib/fuse.c -=== fuse-2.8.6.orig/lib/fuse.c 2011-09-13 00:23:14.0 -0700 -+++ fuse-2.8.6/lib/fuse.c 2011-10-19 09:20:27.537099939 -0700 -@@ -3947,11 +3947,11 @@ - 11); - } - --FUSE_SYMVER(".symver fuse_exited,__fuse_exited@"); --FUSE_SYMVER(".symver fuse_process_cmd,__fuse_process_cmd@"); --FUSE_SYMVER(".symver fuse_read_cmd,__fuse_read_cmd@"); --FUSE_SYMVER(".symver fuse_set_getcontext_func,__fuse_set_getcontext_func@"); --FUSE_SYMVER(".symver fuse_new_compat2,fuse_new@"); -+FUSE_SYMVER(".symver fuse_exited,__fuse_exited@FUSE_UNVERSIONED"); -+FUSE_SYMVER(".symver fuse_process_cmd,__fuse_process_cmd@FUSE_UNVERSIONED"); -+FUSE_SYMVER(".symver fuse_read_cmd,__fuse_read_cmd@FUSE_UNVERSIONED"); -+FUSE_SYMVER(".symver fuse_set_getcontext_func,__fuse_set_getcontext_func@FUSE_UNVERSIONED"); -+FUSE_SYMVER(".symver fuse_new_compat2,fuse_new@FUSE_UNVERSIONED"); - FUSE_SYMVER(".symver fuse_new_compat22,fuse_new@FUSE_2.2"); - - #endif /* __FreeBSD__ */ -Index: fuse-2.8.6/lib/fuse_mt.c -=== fuse-2.8.6.orig/lib/fuse_mt.c 2011-09-13 00:23:14.0 -0700 -+++ fuse-2.8.6/lib/fuse_mt.c 2011-10-19 09:20:27.537099939 -0700 -@@ -113,4 +113,4 @@ - return fuse_session_loop_mt(fuse_get_session(f)); - } - --FUSE_SYMVER(".symver fuse_loop_mt_proc,__fuse_loop_mt@"); -+FUSE_SYMVER(".symver fuse_loop_mt_proc,__fuse_loop_mt@FUSE_UNVERSIONED"); -Index: fuse-2.8.6/lib/fuse_versionscript -=== fuse-2.8.6.orig/lib/fuse_versionscript 2011-09-13 00:23:14.0 -0700 -+++ fuse-2.8.6/lib/fuse_versionscript 2011-10-19 09:20:27.541099939 -0700 -@@ -1,3 +1,6 @@ -+FUSE_UNVERSIONED { -+}; -+ - FUSE_2.2 { - global: - fuse_destroy; -Index: fuse-2.8.6/lib/helper.c -=== fuse-2.8.6.orig/lib/helper.c 2011-09-13 00:23:14.0 -0700 -+++ fuse-2.8.6/lib/helper.c2011-10-19 09:20:27.541099939 -0700 -@@ -409,10 +409,10 @@ - return fuse_mount_compat22(mountpoint, NULL); - } - --FUSE_SYMVER(".symver fuse_setup_compat2,__fuse_setup@"); -+FUSE_SYMVER(".symver fuse_setup_compat2,__fuse_setup@FUSE_UNVERSIONED"); - FUSE_SYMVER(".symver fuse_setup_compat22,fuse_setup@FUSE_2.2"); --FUSE_SYMVER(".symver fuse_teardown,__fuse_teardown@"); --FUSE_SYMVER(".symver fuse_main_compat2,fuse_main@"); -+FUSE_SYMVER(".symver fuse_teardown,__fuse_teardown@FUSE_UNVERSIONED"); -+FUSE_SYMVER(".symver fuse_main_compat2,fuse_main@FUSE_UNVERSIONED"); - FUSE_SYMVER(".symver fuse_main_real_compat22,fuse_main_real@FUSE_2.2"); - - #endif /* __FreeBSD__ */ diff --git a/meta-oe/recipes-support/fuse/fuse-2.9.2/gold-unversioned-symbol.patch b/meta-oe/recipes-support/fuse/fuse-2.9.2/gold-unversioned-symbol.patch new file mode 100644 index 000..8ee97df --- /dev/null +++ b/meta-oe/recipes-support/fuse/fuse-2.9.2/gold-unversioned-symbol.patch @@ -0,0 +1,60 @@ +Index: fuse-2.8.6/lib/fuse.c +=== +--- fuse-2.8.6.orig/lib/fuse.c 2011-09-13 00:23:14.0 -0700 fuse-2.8.6/lib/fuse.c 2011-10-19 09:20:27.537099939 -0700 +@@ -3947,11 +3947,11 @@ + 11); + } + +-FUSE_SYMVER(".symver fuse_exited,__fuse_exited@"); +-FUSE_SYMVER(".symver fuse_process_cmd,__fuse_process_cmd@"); +-FUSE_SYMVER(".symver fuse_read_cmd,__fuse_read_cmd@"); +-FUSE_SYMVER(".symver fuse_set_getcontext_func,__fuse_set_getcontext_func@"); +-FUSE_SYMVER(".symver fuse_new_compat2,fuse_new@"); ++FUSE_SYMVER(".symver fuse_exited,__fuse_exited@FUSE_UNVERSIONED"); ++FUSE_SYMVER(".symver fuse_process_cmd,__fuse_process_cmd@FUSE_UNVERSIONED"); ++FUSE_SYMVER(".symver fuse_read_cmd,__fuse_read
Re: [oe] [OE-core] [PATCH] gypsy: removed gypsy from meta/recipes-connectivity
On Thu, Oct 18, 2012 at 08:59:19PM +0200, Martin Jansa wrote: > I know you've sent > http://patchwork.openembedded.org/patch/37763/ > to add it to meta-oe, but this patch removed also newer gypsy_0.9.bb > and only older gypsy_git.bb was added back. > > Please fix that. There is also this diff which isn't mentioned in your commit. -SRCREV = "3652e1f37e82b8e63983e30fda3482cd099a8cf5" +SRCREV = "be8c9c382d2d1d37b51d29b0843045121ec90213" PV = "0.8+git${SRCPV}" PR = "r2" @@ -15,4 +15,5 @@ file://gypsy/gypsy-time.h;beginline=1;endline=24;md5=06432ea19a7b6607428d04d9dadc37fd" SRC_URI = "git://anongit.freedesktop.org/gypsy;protocol=git \ - file://fixups.patch" + file://fixups.patch \ + file://0001-gypsy-m4-directory-missing-from-structure.patch" > > On Thu, Oct 4, 2012 at 12:14 PM, Andrei Dinu > wrote: > > removed also entry from > > meta/recipes-gnome/packagegroups/packagegroup-sdk-gmae.inc > > > > Signed-off-by: Andrei Dinu > > --- > > meta/recipes-connectivity/gypsy/files/fixups.patch | 21 - > > meta/recipes-connectivity/gypsy/gypsy.inc | 15 > > meta/recipes-connectivity/gypsy/gypsy_0.9.bb | 24 > > > > meta/recipes-connectivity/gypsy/gypsy_git.bb | 18 --- > > .../packagegroups/packagegroup-sdk-gmae.inc|1 - > > 5 files changed, 79 deletions(-) > > delete mode 100644 meta/recipes-connectivity/gypsy/files/fixups.patch > > delete mode 100644 meta/recipes-connectivity/gypsy/gypsy.inc > > delete mode 100644 meta/recipes-connectivity/gypsy/gypsy_0.9.bb > > delete mode 100644 meta/recipes-connectivity/gypsy/gypsy_git.bb > > > > diff --git a/meta/recipes-connectivity/gypsy/files/fixups.patch > > b/meta/recipes-connectivity/gypsy/files/fixups.patch > > deleted file mode 100644 > > index de4d92e..000 > > --- a/meta/recipes-connectivity/gypsy/files/fixups.patch > > +++ /dev/null > > @@ -1,21 +0,0 @@ > > -Upstream-Status: Inappropriate [configuration] > > - > > > > - docs/reference/Makefile.am |2 ++ > > - 1 file changed, 2 insertions(+) > > - > > gypsy.orig/docs/reference/Makefile.am > > -+++ gypsy/docs/reference/Makefile.am > > -@@ -81,10 +81,12 @@ expand_content_files= > > - # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) > > - > > - INCLUDES=-I$(top_srcdir) $(GYPSY_CFLAGS) > > - GTKDOC_LIBS=$(top_builddir)/gypsy/libgypsy.la $(GYPSY_LIBS) > > - > > -+EXTRA_DIST = > > -+CLEANFILES = > > - # This includes the standard gtk-doc make rules, copied by gtkdocize. > > - include $(top_srcdir)/gtk-doc.make > > - > > - # Other files to distribute > > - # e.g. EXTRA_DIST += version.xml.in > > diff --git a/meta/recipes-connectivity/gypsy/gypsy.inc > > b/meta/recipes-connectivity/gypsy/gypsy.inc > > deleted file mode 100644 > > index 0c1735e..000 > > --- a/meta/recipes-connectivity/gypsy/gypsy.inc > > +++ /dev/null > > @@ -1,15 +0,0 @@ > > -SUMMARY = "GPS Multiplexing Daemon" > > -DESCRIPTION = "Gypsy is a GPS multiplexing daemon which allows \ > > -multiple clients to access GPS data from multiple GPS sources \ > > -concurrently. Gypsy also hides the details of parsing NMEA from the \ > > -client applications, passing the data as simple values for the clients \ > > -to use." > > -LICENSE = "GPLv2.0 & LGPLv2.1" > > -SECTION = "x11" > > -DEPENDS = "glib-2.0 dbus bluez4 dbus-glib" > > - > > -inherit autotools pkgconfig gtk-doc > > - > > -EXTRA_OECONF += "--with-distro=debian" > > - > > -FILES_${PN} += "/usr/share/dbus-1/services/" > > diff --git a/meta/recipes-connectivity/gypsy/gypsy_0.9.bb > > b/meta/recipes-connectivity/gypsy/gypsy_0.9.bb > > deleted file mode 100644 > > index 51207c9..000 > > --- a/meta/recipes-connectivity/gypsy/gypsy_0.9.bb > > +++ /dev/null > > @@ -1,24 +0,0 @@ > > -SUMMARY = "GPS Multiplexing Daemon" > > -DESCRIPTION = "Gypsy is a GPS multiplexing daemon which allows \ > > -multiple clients to access GPS data from multiple GPS sources \ > > -concurrently. Gypsy also hides the details of parsing NMEA from the \ > > -client applications, passing the data as simple values for the clients \ > > -to use." > > -LICENSE = "GPLv2+ & LGPLv2+" > > -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ > > - > > file://COPYING.lib;md5=7fbc338309ac38fefcd64b04bb903e34 \ > > - > > file://src/main.c;beginline=1;endline=25;md5=3fe64e27e61b289b77383a54a982cbdd > > \ > > - > > file://gypsy/gypsy-time.h;beginline=1;endline=24;md5=06432ea19a7b6607428d04d9dadc37fd" > > - > > -SECTION = "x11" > > -DEPENDS = "glib-2.0 dbus bluez4 dbus-glib libxslt" > > - > > -SRC_URI = "http://gypsy.freedesktop.org/releases/gypsy-${PV}.tar.gz"; > > -PR = "r1" > > - > > -inherit autotools pkgconfig > > - > > -FILES_${PN} += "/usr/share/dbus-1/system-services/" > > - > > -SRC_URI[md5sum] = "e2d186df9c2cc3b70a027043e22acf1a" > > -SRC_URI[sha256sum] = > > "14e1
Re: [oe] [PATCH] [meta-oe] libav: Fix git URI
On 2012-10-18 12:48, Martin Jansa wrote: On Thu, Oct 18, 2012 at 12:29:00PM -0600, Gary Thomas wrote: On 2012-10-18 11:46, Martin Jansa wrote: On Thu, Oct 18, 2012 at 10:51:29AM -0600, Gary Thomas wrote: Specifying SRCREV and branch in the git SRC_URI confuses the bitbake fetcher. This ends up with a saved tarball which contains neither the SRCREV nor the branch, which in turn means the git tree needs to be fetched every time even though a saved tarball has been created. That's fetcher fault. Branch is part of persistent db key for LOCALCOUNT, so this breaks upgrade path. Also AUTOREV wont work without branch specified in SRC_URI. AUTOREV is not being used, so how does your comment apply? yes it's good practise to use it from some .inc even or local.conf, _without_ need to change SRC_URI But the whole point is to have a specific SRCREV, not AUTOREV. Having a recipe which always gets the latest revision is often not advised nor even allowed in some circles. This particular recipe obviously wanted to use a particular revision, not the tip of the "releases/0.8" branch. Specifying both is contradictory. Fix bitbake fetcher instead. Cheers, Simply removing the branch (which is redundant anyway) from the SRC_URI makes everything happy. Signed-off-by: Gary Thomas --- meta-oe/recipes-multimedia/libav/libav_0.8.3.bb |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb b/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb index 66a32c9..f9a2e06 100644 --- a/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb +++ b/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb @@ -6,13 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" PV = "0.8.3+git${SRCPV}" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" # When bumping SRCREV make sure you bump PR here and in dependant # recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION # changes SRCREV = "2fb4be9a99a2c2a9435339830e3d940171cc0d9b" -SRC_URI = "git://git.libav.org/libav.git;protocol=git;branch=release/0.8" +SRC_URI = "git://git.libav.org/libav.git;protocol=git" S = "${WORKDIR}/git" -- 1.7.9.5 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel -- Gary Thomas | Consulting for the MLB Associates |Embedded world ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel -- Gary Thomas | Consulting for the MLB Associates |Embedded world ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 3/5] ecore: drop libxputil from DEPENDS
* it was removed from oe-core http://git.openembedded.org/openembedded-core/commit/?id=5b3748d463ac0d8e2624092619da8d8e6328 * it needs to be explicitly disabled now, because recipe was removed in oe-core, but files still stay in sysroot and we cannot even cleansstate it now without recipes around. Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/efl/ecore.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-efl/recipes-efl/efl/ecore.inc b/meta-efl/recipes-efl/efl/ecore.inc index 9faaf3a..7744501 100644 --- a/meta-efl/recipes-efl/efl/ecore.inc +++ b/meta-efl/recipes-efl/efl/ecore.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Ecore is the Enlightenment application framework library" LICENSE = "MIT BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=d6ff2c3c85de2faf5fd7dcd9ccfc8886" DEPENDS = "virtual/libiconv tslib curl eet evas glib-2.0 gnutls \ - libxtst libxcomposite libxinerama libxscrnsaver libxdamage libxrandr libxcursor libxprintutil" + libxtst libxcomposite libxinerama libxscrnsaver libxdamage libxrandr libxcursor" DEPENDS_virtclass-native = "eet-native evas-native gettext-native" # optional # DEPENDS += "directfb virtual/libsdl openssl virtual/libiconv" @@ -10,7 +10,7 @@ DEPENDS_virtclass-native = "eet-native evas-native gettext-native" inherit efl gettext BBCLASSEXTEND = "native" -INC_PR = "r0" +INC_PR = "r1" do_configure_prepend() { touch ${S}/po/Makefile.in.in || true @@ -78,6 +78,7 @@ ECORE_OECONF = "\ --enable-inotify \ --disable-ecore-desktop \ --disable-ecore-x-xcb \ + --disable-ecore-x-xprint \ --disable-ecore-directfb \ --disable-ecore-sdl \ --enable-ecore-evas-opengl-x11 \ -- 1.7.12.4 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 4/5] libxaw: drop libxp and printproto from DEPENDS
* it was removed from oe-core http://git.openembedded.org/openembedded-core/commit/?id=5b3748d463ac0d8e2624092619da8d8e6328 * there should be --disable-xprint/--without-xprint too, but it looks like all support for xprint was removed from libxaw already commit 012e73faab8dc8617c6da4679715dae14f6cddd4 Author: Daniel Stone Date: Fri Aug 15 18:25:53 2008 +0300 Remove last remaining vestiges of Xprint support Signed-off-by: Martin Jansa --- meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.10.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.10.bb b/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.10.bb index 88863a7..f5a4a6f 100644 --- a/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.10.bb +++ b/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.10.bb @@ -1,11 +1,11 @@ require recipes-graphics/xorg-lib/xorg-lib-common.inc DESCRIPTION = "X Athena Widget Set" -DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau xmlto-native" +DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxau xmlto-native" LIC_FILES_CHKSUM = "file://COPYING;md5=1c65719d42900bb81b83e8293c20a364" PE = "1" -PR = "r1" +PR = "r2" SRC_URI[md5sum] = "f1ea52debce7a18cc26b21647a00ad8b" SRC_URI[sha256sum] = "2d96bcf92638b8ec5c91d379f5ec2e7b15133adeb2ba22066d48bf3239ee1bdd" -- 1.7.12.4 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 5/5] mcnavi: move from meta-oe to meta-efl
* mcnavi depends on ecore, but meta-oe does not depend on meta-efl * thanks to kergoth for reporting this! Signed-off-by: Martin Jansa --- {meta-oe => meta-efl}/recipes-navigation/mcnavi/mcnavi_0.3.3.bb | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {meta-oe => meta-efl}/recipes-navigation/mcnavi/mcnavi_0.3.3.bb (100%) diff --git a/meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb b/meta-efl/recipes-navigation/mcnavi/mcnavi_0.3.3.bb similarity index 100% rename from meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb rename to meta-efl/recipes-navigation/mcnavi/mcnavi_0.3.3.bb -- 1.7.12.4 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 2/5] mcnavi: remove myslq_config include path work around
* it was fixed in mysql5 3f95bb907381ac5fd789452e1330c12f9a8904f9 Signed-off-by: Martin Jansa --- meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb b/meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb index 35c304c..75958d0 100644 --- a/meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb +++ b/meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" DEPENDS = "ecore evas imlib2 gpsd edje edje-native mysql5" -PR = "r1" +PR = "r2" SRC_URI = "http://www.gps-routes.info/debian/pool/main/m/mcnavi/mcnavi_${PV}.tar.gz"; SRC_URI[md5sum] = "acc07debcdb3ef448b95e6a6cfcf53d8" @@ -12,9 +12,4 @@ SRC_URI[sha256sum] = "d3ce1f5901f13985d877b2b6ad06b64094ba43a4e13cbfe06c7cb2f1ab S = "${WORKDIR}/${PN}" -do_configure_prepend() { - # for some reason our mysql_config returns just sysroot/include_dir while mysql.h is in include_dir/mysql - sed -i 's#`mysql_config --include`$#`mysql_config --include`/mysql#g' ${S}/configure.ac -} - inherit autotools -- 1.7.12.4 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 0/5] Small changes #101
The following changes since commit 4cd60deb11a8a6f9134d7f6ec39255a35d921426: hiawatha: add initial 8.5 recipe and associated files (2012-10-18 15:12:31 +0100) are available in the git repository at: git://git.openembedded.org/meta-openembedded-contrib jansa/pull http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull Martin Jansa (5): PACKAGES_DYNAMIC: use regexp not glob mcnavi: remove myslq_config include path work around ecore: drop libxputil from DEPENDS libxaw: drop libxp and printproto from DEPENDS mcnavi: move from meta-oe to meta-efl meta-efl/recipes-efl/efl/ecore.inc | 5 +++-- meta-efl/recipes-efl/efl/evas-generic-loaders.inc | 2 +- meta-efl/recipes-efl/efl/evas.inc | 2 +- {meta-oe => meta-efl}/recipes-navigation/mcnavi/mcnavi_0.3.3.bb | 7 +-- meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb | 2 +- meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb | 2 +- meta-gnome/recipes-gnome/gtk+/gtk+3_3.2.3.bb| 2 +- meta-gnome/recipes-support/goffice/goffice_0.8.17.bb| 2 +- meta-initramfs/recipes-devtools/klibc/klibc-utils.inc | 2 +- meta-oe/recipes-devtools/libcanberra/libcanberra_0.26.bb| 2 +- meta-oe/recipes-extended/lcdproc/lcdproc5.inc | 2 +- meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb | 2 +- meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.10.bb | 4 ++-- meta-oe/recipes-multimedia/libav/libav.inc | 2 +- meta-oe/recipes-support/freerdp/freerdp.inc | 2 +- meta-oe/recipes-support/openldap/openldap_2.4.23.bb | 2 +- meta-oe/recipes-support/pidgin/pidgin.inc | 2 +- meta-xfce/recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb | 2 +- meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.10.0.bb| 2 +- meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.0.bb| 2 +- 20 files changed, 23 insertions(+), 27 deletions(-) rename {meta-oe => meta-efl}/recipes-navigation/mcnavi/mcnavi_0.3.3.bb (71%) -- 1.7.12.4 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/5] PACKAGES_DYNAMIC: use regexp not glob
* bitbake uses PACKAGES_DYNAMIC as regexp ^ could make matching faster (and it will be more clear that we're expecting regexp not glob) * made all those last '-' optional, use .* (or nothing) * use += instead of = in most cases to keep ${PN}-locale from bitbake.conf:PACKAGES_DYNAMIC = "^${PN}-locale-.*" Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/efl/evas-generic-loaders.inc | 2 +- meta-efl/recipes-efl/efl/evas.inc | 2 +- meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb | 2 +- meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb| 2 +- meta-gnome/recipes-gnome/gtk+/gtk+3_3.2.3.bb | 2 +- meta-gnome/recipes-support/goffice/goffice_0.8.17.bb | 2 +- meta-initramfs/recipes-devtools/klibc/klibc-utils.inc | 2 +- meta-oe/recipes-devtools/libcanberra/libcanberra_0.26.bb | 2 +- meta-oe/recipes-extended/lcdproc/lcdproc5.inc | 2 +- meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb | 2 +- meta-oe/recipes-multimedia/libav/libav.inc| 2 +- meta-oe/recipes-support/freerdp/freerdp.inc | 2 +- meta-oe/recipes-support/openldap/openldap_2.4.23.bb | 2 +- meta-oe/recipes-support/pidgin/pidgin.inc | 2 +- meta-xfce/recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb | 2 +- meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.10.0.bb | 2 +- meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.0.bb | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders.inc b/meta-efl/recipes-efl/efl/evas-generic-loaders.inc index 7556eb2..cb11334 100644 --- a/meta-efl/recipes-efl/efl/evas-generic-loaders.inc +++ b/meta-efl/recipes-efl/efl/evas-generic-loaders.inc @@ -30,4 +30,4 @@ python populate_packages_prepend () { FILES_evas-generic-loader-xcf += "${libdir}/evas/utils/*.xcf.gz" FILES_${PN}-dbg += "${libdir}/evas/utils/.debug" -PACKAGES_DYNAMIC = "evas-generic-loader-*" +PACKAGES_DYNAMIC += "^evas-generic-loader-.*" diff --git a/meta-efl/recipes-efl/efl/evas.inc b/meta-efl/recipes-efl/efl/evas.inc index b0ec0cf..e3e5d39 100644 --- a/meta-efl/recipes-efl/efl/evas.inc +++ b/meta-efl/recipes-efl/efl/evas.inc @@ -40,7 +40,7 @@ FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/ ${libdir}/evas/cserve2/ FILES_${PN}-cserve2 += "${libexecdir}/evas_cserve2* ${libexecdir}/dummy_slave" PACKAGES += "${PN}-cserve2" -PACKAGES_DYNAMIC = "evas-engine-* evas-loader-* evas-saver-* evas-cserve2-*" +PACKAGES_DYNAMIC += "^evas-engine-.* ^evas-loader-.* ^evas-saver-.* ^evas-cserve2-.*" # evas-loader-svg is gone as we don't have esvg and probably won't have anytime soon # http://www.intesis.hr/news/16-esvg-source diff --git a/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb b/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb index 8c3aab4..60b970b 100644 --- a/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb +++ b/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb @@ -99,7 +99,7 @@ FILES_${PN}-strings+= "${datadir}/${PN}-${SHRT_VER}/AbiWord/strings" FILES_${PN}-systemprofiles += "${datadir}/${PN}-${SHRT_VER}/AbiWord/system.profile*" FILES_${PN}-templates += "${datadir}/${PN}-${SHRT_VER}/templates" -PACKAGES_DYNAMIC = "${PN}-meta ${PN}-plugin-*" +PACKAGES_DYNAMIC += "^${PN}-meta.* ^${PN}-plugin-.*" python populate_packages_prepend () { abiword_libdir= bb.data.expand('${libdir}/abiword-2.8/plugins', d) diff --git a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb index 586eed8..46be86f 100644 --- a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb +++ b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb @@ -40,7 +40,7 @@ FILES_${PN}-dbg += " ${libdir}/gnome-vfs-2.0/modules/.debug" FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/include" FILES_${PN}-doc += " ${datadir}/gtk-doc" -PACKAGES_DYNAMIC = "gnome-vfs-plugin-*" +PACKAGES_DYNAMIC += "^gnome-vfs-plugin-.*" python populate_packages_prepend () { print bb.data.getVar('FILES_gnome-vfs', d, 1) diff --git a/meta-gnome/recipes-gnome/gtk+/gtk+3_3.2.3.bb b/meta-gnome/recipes-gnome/gtk+/gtk+3_3.2.3.bb index c1f535b..32b54ef 100644 --- a/meta-gnome/recipes-gnome/gtk+/gtk+3_3.2.3.bb +++ b/meta-gnome/recipes-gnome/gtk+/gtk+3_3.2.3.bb @@ -72,7 +72,7 @@ FILES_${PN}-dbg += " \ ${libdir}/gtk-3.0/modules/.debug" -PACKAGES_DYNAMIC += "gtk3-immodule-* gtk3-printbackend-*" +PACKAGES_DYNAMIC += "^gtk3-immodule-.* ^gtk3-printbackend-.*" python populate_packages_prepend () { import os.path diff --git a/meta-gnome/recipes-support/goffice/goffice_0.8.17.bb b/meta-gnome/recipes-support/goffice/goffice_0.8.17.bb index c55a8ac..4b64731 100644 --- a/meta-gnome/recipes-support/goffice/goffice_0.8.17.bb +++ b/meta-gnome/recipes-support/goffice/goffice_0.8.17.bb @@ -36,7 +36,7 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${
Re: [oe] [PATCH] [meta-oe] libav: Fix git URI
On Thu, Oct 18, 2012 at 12:29:00PM -0600, Gary Thomas wrote: > On 2012-10-18 11:46, Martin Jansa wrote: > > On Thu, Oct 18, 2012 at 10:51:29AM -0600, Gary Thomas wrote: > >> Specifying SRCREV and branch in the git SRC_URI confuses the bitbake > >> fetcher. This ends up with a saved tarball which contains neither > >> the SRCREV nor the branch, which in turn means the git tree needs > >> to be fetched every time even though a saved tarball has been created. > > > > That's fetcher fault. > > > > Branch is part of persistent db key for LOCALCOUNT, so this breaks > > upgrade path. > > > > Also AUTOREV wont work without branch specified in SRC_URI. > > AUTOREV is not being used, so how does your comment apply? yes it's good practise to use it from some .inc even or local.conf, _without_ need to change SRC_URI > > Fix bitbake fetcher instead. > > > > Cheers, > > > > > >> Simply removing the branch (which is redundant anyway) from the SRC_URI > >> makes everything happy. > >> > >> Signed-off-by: Gary Thomas > >> --- > >> meta-oe/recipes-multimedia/libav/libav_0.8.3.bb |4 ++-- > >> 1 file changed, 2 insertions(+), 2 deletions(-) > >> > >> diff --git a/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb > >> b/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb > >> index 66a32c9..f9a2e06 100644 > >> --- a/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb > >> +++ b/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb > >> @@ -6,13 +6,13 @@ LIC_FILES_CHKSUM = > >> "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ > >> > >> file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" > >> > >> PV = "0.8.3+git${SRCPV}" > >> -PR = "${INC_PR}.0" > >> +PR = "${INC_PR}.1" > >> > >> # When bumping SRCREV make sure you bump PR here and in dependant > >> # recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION > >> # changes > >> SRCREV = "2fb4be9a99a2c2a9435339830e3d940171cc0d9b" > >> -SRC_URI = "git://git.libav.org/libav.git;protocol=git;branch=release/0.8" > >> +SRC_URI = "git://git.libav.org/libav.git;protocol=git" > >> > >> S = "${WORKDIR}/git" > >> > >> -- > >> 1.7.9.5 > >> > >> > >> ___ > >> Openembedded-devel mailing list > >> Openembedded-devel@lists.openembedded.org > >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel > > > > > > > > ___ > > Openembedded-devel mailing list > > Openembedded-devel@lists.openembedded.org > > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel > > > > -- > > Gary Thomas | Consulting for the > MLB Associates |Embedded world > > > ___ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH] [meta-oe] libav: Fix git URI
On 2012-10-18 11:46, Martin Jansa wrote: On Thu, Oct 18, 2012 at 10:51:29AM -0600, Gary Thomas wrote: Specifying SRCREV and branch in the git SRC_URI confuses the bitbake fetcher. This ends up with a saved tarball which contains neither the SRCREV nor the branch, which in turn means the git tree needs to be fetched every time even though a saved tarball has been created. That's fetcher fault. Branch is part of persistent db key for LOCALCOUNT, so this breaks upgrade path. Also AUTOREV wont work without branch specified in SRC_URI. AUTOREV is not being used, so how does your comment apply? Fix bitbake fetcher instead. Cheers, Simply removing the branch (which is redundant anyway) from the SRC_URI makes everything happy. Signed-off-by: Gary Thomas --- meta-oe/recipes-multimedia/libav/libav_0.8.3.bb |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb b/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb index 66a32c9..f9a2e06 100644 --- a/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb +++ b/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb @@ -6,13 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" PV = "0.8.3+git${SRCPV}" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" # When bumping SRCREV make sure you bump PR here and in dependant # recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION # changes SRCREV = "2fb4be9a99a2c2a9435339830e3d940171cc0d9b" -SRC_URI = "git://git.libav.org/libav.git;protocol=git;branch=release/0.8" +SRC_URI = "git://git.libav.org/libav.git;protocol=git" S = "${WORKDIR}/git" -- 1.7.9.5 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel -- Gary Thomas | Consulting for the MLB Associates |Embedded world ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH] [meta-oe] libav: Fix git URI
On Thu, Oct 18, 2012 at 10:51:29AM -0600, Gary Thomas wrote: > Specifying SRCREV and branch in the git SRC_URI confuses the bitbake > fetcher. This ends up with a saved tarball which contains neither > the SRCREV nor the branch, which in turn means the git tree needs > to be fetched every time even though a saved tarball has been created. That's fetcher fault. Branch is part of persistent db key for LOCALCOUNT, so this breaks upgrade path. Also AUTOREV wont work without branch specified in SRC_URI. Fix bitbake fetcher instead. Cheers, > Simply removing the branch (which is redundant anyway) from the SRC_URI > makes everything happy. > > Signed-off-by: Gary Thomas > --- > meta-oe/recipes-multimedia/libav/libav_0.8.3.bb |4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb > b/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb > index 66a32c9..f9a2e06 100644 > --- a/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb > +++ b/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb > @@ -6,13 +6,13 @@ LIC_FILES_CHKSUM = > "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ > > file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" > > PV = "0.8.3+git${SRCPV}" > -PR = "${INC_PR}.0" > +PR = "${INC_PR}.1" > > # When bumping SRCREV make sure you bump PR here and in dependant > # recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION > # changes > SRCREV = "2fb4be9a99a2c2a9435339830e3d940171cc0d9b" > -SRC_URI = "git://git.libav.org/libav.git;protocol=git;branch=release/0.8" > +SRC_URI = "git://git.libav.org/libav.git;protocol=git" > > S = "${WORKDIR}/git" > > -- > 1.7.9.5 > > > ___ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [PATCH] [meta-oe] libav: Fix git URI
Specifying SRCREV and branch in the git SRC_URI confuses the bitbake fetcher. This ends up with a saved tarball which contains neither the SRCREV nor the branch, which in turn means the git tree needs to be fetched every time even though a saved tarball has been created. Simply removing the branch (which is redundant anyway) from the SRC_URI makes everything happy. Signed-off-by: Gary Thomas --- meta-oe/recipes-multimedia/libav/libav_0.8.3.bb |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb b/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb index 66a32c9..f9a2e06 100644 --- a/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb +++ b/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb @@ -6,13 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" PV = "0.8.3+git${SRCPV}" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" # When bumping SRCREV make sure you bump PR here and in dependant # recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION # changes SRCREV = "2fb4be9a99a2c2a9435339830e3d940171cc0d9b" -SRC_URI = "git://git.libav.org/libav.git;protocol=git;branch=release/0.8" +SRC_URI = "git://git.libav.org/libav.git;protocol=git" S = "${WORKDIR}/git" -- 1.7.9.5 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [OE-core] Fwd: [oe-commits] Mark Hatle : prelink: Update to latest upstream prelink
On Fri, Aug 17, 2012 at 11:45 PM, Richard Purdie wrote: > On Fri, 2012-08-17 at 23:21 +0200, Andreas Müller wrote: >> On Fri, Aug 17, 2012 at 7:09 PM, wrote: >> > Module: openembedded-core.git >> > Branch: master >> > Commit: 7759c9a2c5dfdc1cae5540a5985632c78abbac89 >> > URL: >> > http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=7759c9a2c5dfdc1cae5540a5985632c78abbac89 >> > >> > Author: Mark Hatle >> > Date: Mon Aug 13 14:49:57 2012 -0500 >> > >> > prelink: Update to latest upstream prelink >> > >> > The latest fixes an obscure problem with prelinking on PowerPC, as well >> > as general updated. >> > >> > Signed-off-by: Mark Hatle >> > Signed-off-by: Saul Wold >> > >> > --- >> > >> > meta/recipes-devtools/prelink/prelink_git.bb |4 ++-- >> > 1 files changed, 2 insertions(+), 2 deletions(-) >> > >> > diff --git a/meta/recipes-devtools/prelink/prelink_git.bb >> > b/meta/recipes-devtools/prelink/prelink_git.bb >> > index c94bdf5..610302e 100644 >> > --- a/meta/recipes-devtools/prelink/prelink_git.bb >> > +++ b/meta/recipes-devtools/prelink/prelink_git.bb >> > @@ -8,9 +8,9 @@ and executables, so that far fewer relocations need to be >> > resolved at \ >> > runtime and thus programs come up faster." >> > LICENSE = "GPLv2" >> > LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" >> > -SRCREV = "7b47f2f8a15ed13b7905bc120bb2586f3e164f7d" >> > +SRCREV = "a2d8e30942bd4bc0a5c852b9d9d12f8684c4bb8d" >> > PV = "1.0+git${SRCPV}" >> > -PR = "r9" >> > +PR = "r10" >> > >> > # >> > # The cron script attempts to re-prelink the system daily -- on >> > >> I think reloading is caused by this change. Since latest update I get >> >> WARNING: Failed to fetch URL >> git://git.yoctoproject.org/prelink-cross.git;protocol=git, attempting >> MIRRORS if available >> ERROR: Fetcher failure: Fetch command export HOME="/home/Superandy"; >> export SSH_AUTH_SOCK="/tmp/keyring-IAYDEC/ssh"; export >> GIT_CONFIG="/home/Superandy/tmp/oe-core-eglibc/sysroots/x86_64-linux/etc/gitconfig"; >> export >> PATH="/home/Superandy/data/oe-core/sources/openembedded-core/scripts/native-intercept:/home/Superandy/data/oe-core/sources/openembedded-core/scripts:/home/Superandy/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/bin/armv7a-vfp-neon-linux:/home/Superandy/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/bin:/home/Superandy/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/sbin:/home/Superandy/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/bin:/home/Superandy/tmp/oe-core-eglibc/sysroots/x86_64-linux/sbin:/home/Superandy/tmp/oe-core-eglibc/sysroots/x86_64-linux//bin:/home/Superandy/oe-core/sources/openembedded-core/scripts:/home/Superandy/oe-core/sources/bitbake/bin:/usr/lib64/qt-3.3/bin:/usr/lib64/ccache:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:./:/home/Superandy/bin:/sbin:/usr/sbin"; >> git remote add --mirror=fetch origin >> git://git.yoctoproject.org/prelink-cross.git failed with exit code >> 129, output: >> STDOUT: >> STDERR: error: option `mirror' takes no value >> usage: git remote add [] >> >> -f, --fetch fetch the remote branches >> --tagsimport all tags and associated objects when >> fetching >> or do not fetch any tag at all (--no-tags) >> -t, --track branch(es) to track >> -m, --master >> master branch >> --mirror no separate remotes >> --mirror option was changed 2y ago here https://github.com/git/git/commit/a9f5a3558dcf83440c60ae5a2e2b56c80d65bb0b get newer git :) someone reported the same to me today with Ubuntu 11.04 :/ >> >> ERROR: Function failed: Fetcher failure for URL: >> 'git://git.yoctoproject.org/prelink-cross.git;protocol=git'. Unable to >> fetch URL from any source. >> ERROR: Logfile of failure stored in: >> /home/Superandy/tmp/oe-core-eglibc/work/x86_64-linux/prelink-native-1.0+git1+a2d8e30942bd4bc0a5c852b9d9d12f8684c4bb8d-r10/temp/log.do_fetch.25940 >> ERROR: Task 103 >> (virtual:native:/home/Superandy/data/oe-core/sources/openembedded-core/meta/recipes-devtools/prelink/prelink_git.bb, >> do_fetch) failed with exit code '1' >> NOTE: Tasks Summary: Attempted 307 tasks of which 262 didn't need to >> be rerun and 1 failed. >> >> Any thoughts? > > You have an incompatible version of git and git-native is in > ASSUME_PROVIDED. We should have detected this and built git-native in > this case. What version of git do you have? > > Cheers, > > Richard > > > ___ > Openembedded-core mailing list > openembedded-c...@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-webserver][PATCH v5] hiawatha: add initial 8.5 recipe and associated files
On Thursday 18 October 2012 15:08:16 Jack Mitchell wrote: > From: Jack Mitchell > > Signed-off-by: Jack Mitchell > -- > > v1: > - hiawatha: add initial 8.5 recipe and associated files > > v2: > - update hiawatha init file with LSB headers > - use sed to put in correct sbin path > --- > .../recipes-httpd/hiawatha/files/hiawatha-init | 44 > + .../recipes-httpd/hiawatha/hiawatha_8.5.bb | > 45 ++ 2 files changed, 89 insertions(+) > create mode 100644 > meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init create mode > 100644 meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb > > diff --git a/meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init > b/meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init new file mode > 100644 > index 000..47fc087 > --- /dev/null > +++ b/meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init > @@ -0,0 +1,44 @@ > +#!/bin/sh > + > +### BEGIN INIT INFO > +# Provides: hiawatha httpd httpd-cgi > +# Required-Start:$syslog $network $remote_fs > +# Required-Stop: $syslog $network $remote_fs > +# Default-Start: 2 3 4 5 > +# Default-Stop: 0 1 6 > +# Short-Description: Hiawatha webserver > +# Description: Hiawatha, a secure and advanced webserver. > +### END INIT INFO > + > +PATH=/sbin:/bin:/usr/sbin:/usr/bin > +DAEMON=sed_sbin_path/hiawatha > +NAME=hiawatha > +DESC="Hiawatha Web Server" > +OPTS="" > + > +case "$1" in > + start) > + echo -n "Starting $DESC: " > + start-stop-daemon --start -x "$DAEMON" -- $OPTS > + echo "$NAME." > + ;; > + stop) > + echo -n "Stopping $DESC: " > + start-stop-daemon --stop -x "$DAEMON" > + echo "$NAME." > + ;; > + restart|force-reload) > + echo -n "Restarting $DESC: " > + start-stop-daemon --stop -x "$DAEMON" > + sleep 1 > + start-stop-daemon --start -x "$DAEMON" -- $OPTS > + echo "$NAME." > + ;; > + *) > + N=/etc/init.d/$NAME > + echo "Usage: $N {start|stop|restart|force-reload}" >&2 > + exit 1 > + ;; > +esac > + > +exit 0 > diff --git a/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb > b/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb new file mode > 100644 > index 000..b4462bb > --- /dev/null > +++ b/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb > @@ -0,0 +1,45 @@ > +DESCRIPTION = "Lightweight secure web server" > +HOMEPAGE = "http://www.hiawatha-webserver.org"; > +LICENSE = "GPLv2" > +LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" > +DEPENDS = "libxml2 libxslt" > + > +SECTION = "net" > + > +SRC_URI = "http://hiawatha-webserver.org/files/${PN}-${PV}.tar.gz \ > + file://hiawatha-init" > + > +SRC_URI[md5sum] = "71d3903657953c93fc930758d158097d" > +SRC_URI[sha256sum] = > "2567e6b4b4c388087b586238e6e91a4afd80e10a879920020a097fcdc946" + > +inherit cmake update-rc.d > + > +INITSCRIPT_NAME = "hiawatha" > +INITSCRIPT_PARAMS = "defaults 70" > + > +EXTRA_OECMAKE = " -DENABLE_IPV6=OFF \ > + -DENABLE_CACHE=ON \ > + -DENABLE_DEBUG=OFF \ > + -DENABLE_SSL=OFF \ > + -DENABLE_TOOLKIT=OFF \ > + -DENABLE_CHROOT=OFF \ > + -DENABLE_XSLT=ON \ > + -DENABLE_TOMAHAWK=OFF \ > + -DCMAKE_INSTALL_MANDIR=${mandir} \ > + -DCMAKE_INSTALL_BINDIR=${bindir} \ > + -DCMAKE_INSTALL_SBINDIR=${sbindir} \ > + -DCMAKE_INSTALL_SYSCONFDIR=${sysconfdir} \ > + -DCMAKE_INSTALL_LIBDIR=${libdir} \ > + -DLOG_DIR=/var/log/hiawatha \ > + -DPID_DIR=/var/run \ > + -DWEBROOT_DIR=/var/www/hiawatha \ > + -DWORK_DIR=/var/lib/hiawatha " > + > +do_install_append() { > + > +# Copy over init script and sed in the correct sbin path > +sed -i 's,sed_sbin_path,${sbindir},' ${WORKDIR}/hiawatha-init > +mkdir -p ${D}${sysconfdir}/init.d > +install -m 0755 ${WORKDIR}/hiawatha-init > ${D}${sysconfdir}/init.d/hiawatha + > +} I merged this with a trivial whitespace fix (indenting of SRC_URI). Thanks! Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-webserver][PATCH v5] hiawatha: add initial 8.5 recipe and associated files
From: Jack Mitchell Signed-off-by: Jack Mitchell -- v1: - hiawatha: add initial 8.5 recipe and associated files v2: - update hiawatha init file with LSB headers - use sed to put in correct sbin path --- .../recipes-httpd/hiawatha/files/hiawatha-init | 44 + .../recipes-httpd/hiawatha/hiawatha_8.5.bb | 45 ++ 2 files changed, 89 insertions(+) create mode 100644 meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init create mode 100644 meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb diff --git a/meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init b/meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init new file mode 100644 index 000..47fc087 --- /dev/null +++ b/meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init @@ -0,0 +1,44 @@ +#!/bin/sh + +### BEGIN INIT INFO +# Provides: hiawatha httpd httpd-cgi +# Required-Start:$syslog $network $remote_fs +# Required-Stop: $syslog $network $remote_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Hiawatha webserver +# Description: Hiawatha, a secure and advanced webserver. +### END INIT INFO + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=sed_sbin_path/hiawatha +NAME=hiawatha +DESC="Hiawatha Web Server" +OPTS="" + +case "$1" in + start) + echo -n "Starting $DESC: " + start-stop-daemon --start -x "$DAEMON" -- $OPTS + echo "$NAME." + ;; + stop) + echo -n "Stopping $DESC: " + start-stop-daemon --stop -x "$DAEMON" + echo "$NAME." + ;; + restart|force-reload) + echo -n "Restarting $DESC: " + start-stop-daemon --stop -x "$DAEMON" + sleep 1 + start-stop-daemon --start -x "$DAEMON" -- $OPTS + echo "$NAME." + ;; + *) + N=/etc/init.d/$NAME + echo "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb b/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb new file mode 100644 index 000..b4462bb --- /dev/null +++ b/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb @@ -0,0 +1,45 @@ +DESCRIPTION = "Lightweight secure web server" +HOMEPAGE = "http://www.hiawatha-webserver.org"; +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" +DEPENDS = "libxml2 libxslt" + +SECTION = "net" + +SRC_URI = "http://hiawatha-webserver.org/files/${PN}-${PV}.tar.gz \ +file://hiawatha-init" + +SRC_URI[md5sum] = "71d3903657953c93fc930758d158097d" +SRC_URI[sha256sum] = "2567e6b4b4c388087b586238e6e91a4afd80e10a879920020a097fcdc946" + +inherit cmake update-rc.d + +INITSCRIPT_NAME = "hiawatha" +INITSCRIPT_PARAMS = "defaults 70" + +EXTRA_OECMAKE = " -DENABLE_IPV6=OFF \ + -DENABLE_CACHE=ON \ + -DENABLE_DEBUG=OFF \ + -DENABLE_SSL=OFF \ + -DENABLE_TOOLKIT=OFF \ + -DENABLE_CHROOT=OFF \ + -DENABLE_XSLT=ON \ + -DENABLE_TOMAHAWK=OFF \ + -DCMAKE_INSTALL_MANDIR=${mandir} \ + -DCMAKE_INSTALL_BINDIR=${bindir} \ + -DCMAKE_INSTALL_SBINDIR=${sbindir} \ + -DCMAKE_INSTALL_SYSCONFDIR=${sysconfdir} \ + -DCMAKE_INSTALL_LIBDIR=${libdir} \ + -DLOG_DIR=/var/log/hiawatha \ + -DPID_DIR=/var/run \ + -DWEBROOT_DIR=/var/www/hiawatha \ + -DWORK_DIR=/var/lib/hiawatha " + +do_install_append() { + +# Copy over init script and sed in the correct sbin path +sed -i 's,sed_sbin_path,${sbindir},' ${WORKDIR}/hiawatha-init +mkdir -p ${D}${sysconfdir}/init.d +install -m 0755 ${WORKDIR}/hiawatha-init ${D}${sysconfdir}/init.d/hiawatha + +} -- 1.7.12.3 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-webserver][PATCH v4] Signed-off-by: Jack Mitchell
From: Jack Mitchell Hiawatha: add initial 8.5 recipe and associated files --- meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb b/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb index a029047..b4462bb 100644 --- a/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb +++ b/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb @@ -37,9 +37,9 @@ EXTRA_OECMAKE = " -DENABLE_IPV6=OFF \ do_install_append() { - # Copy over init script and sed in the correct sbin path - sed -i 's,sed_sbin_path,${sbindir},' ${WORKDIR}/hiawatha-init - mkdir -p ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/hiawatha-init ${D}${sysconfdir}/init.d/hiawatha +# Copy over init script and sed in the correct sbin path +sed -i 's,sed_sbin_path,${sbindir},' ${WORKDIR}/hiawatha-init +mkdir -p ${D}${sysconfdir}/init.d +install -m 0755 ${WORKDIR}/hiawatha-init ${D}${sysconfdir}/init.d/hiawatha } -- 1.7.12.3 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-webserver][PATCH\ v3] hiawatha: add initial 8.5 recipe and associated files
From: Jack Mitchell --- v1: - hiawatha: add initial 8.5 recipe and associated files v2: - update hiawatha init file with LSB headers - use sed to put in correct sbin path Signed-off-by: Jack Mitchell .../recipes-httpd/hiawatha/files/hiawatha-init | 44 + .../recipes-httpd/hiawatha/hiawatha_8.5.bb | 45 ++ 2 files changed, 89 insertions(+) create mode 100644 meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init create mode 100644 meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb diff --git a/meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init b/meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init new file mode 100644 index 000..47fc087 --- /dev/null +++ b/meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init @@ -0,0 +1,44 @@ +#!/bin/sh + +### BEGIN INIT INFO +# Provides: hiawatha httpd httpd-cgi +# Required-Start:$syslog $network $remote_fs +# Required-Stop: $syslog $network $remote_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Hiawatha webserver +# Description: Hiawatha, a secure and advanced webserver. +### END INIT INFO + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=sed_sbin_path/hiawatha +NAME=hiawatha +DESC="Hiawatha Web Server" +OPTS="" + +case "$1" in + start) + echo -n "Starting $DESC: " + start-stop-daemon --start -x "$DAEMON" -- $OPTS + echo "$NAME." + ;; + stop) + echo -n "Stopping $DESC: " + start-stop-daemon --stop -x "$DAEMON" + echo "$NAME." + ;; + restart|force-reload) + echo -n "Restarting $DESC: " + start-stop-daemon --stop -x "$DAEMON" + sleep 1 + start-stop-daemon --start -x "$DAEMON" -- $OPTS + echo "$NAME." + ;; + *) + N=/etc/init.d/$NAME + echo "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb b/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb new file mode 100644 index 000..a029047 --- /dev/null +++ b/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb @@ -0,0 +1,45 @@ +DESCRIPTION = "Lightweight secure web server" +HOMEPAGE = "http://www.hiawatha-webserver.org"; +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" +DEPENDS = "libxml2 libxslt" + +SECTION = "net" + +SRC_URI = "http://hiawatha-webserver.org/files/${PN}-${PV}.tar.gz \ +file://hiawatha-init" + +SRC_URI[md5sum] = "71d3903657953c93fc930758d158097d" +SRC_URI[sha256sum] = "2567e6b4b4c388087b586238e6e91a4afd80e10a879920020a097fcdc946" + +inherit cmake update-rc.d + +INITSCRIPT_NAME = "hiawatha" +INITSCRIPT_PARAMS = "defaults 70" + +EXTRA_OECMAKE = " -DENABLE_IPV6=OFF \ + -DENABLE_CACHE=ON \ + -DENABLE_DEBUG=OFF \ + -DENABLE_SSL=OFF \ + -DENABLE_TOOLKIT=OFF \ + -DENABLE_CHROOT=OFF \ + -DENABLE_XSLT=ON \ + -DENABLE_TOMAHAWK=OFF \ + -DCMAKE_INSTALL_MANDIR=${mandir} \ + -DCMAKE_INSTALL_BINDIR=${bindir} \ + -DCMAKE_INSTALL_SBINDIR=${sbindir} \ + -DCMAKE_INSTALL_SYSCONFDIR=${sysconfdir} \ + -DCMAKE_INSTALL_LIBDIR=${libdir} \ + -DLOG_DIR=/var/log/hiawatha \ + -DPID_DIR=/var/run \ + -DWEBROOT_DIR=/var/www/hiawatha \ + -DWORK_DIR=/var/lib/hiawatha " + +do_install_append() { + + # Copy over init script and sed in the correct sbin path + sed -i 's,sed_sbin_path,${sbindir},' ${WORKDIR}/hiawatha-init + mkdir -p ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/hiawatha-init ${D}${sysconfdir}/init.d/hiawatha + +} -- 1.7.12.3 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java 0/5] icedtea build fixes
On 05.10.2012 21:45, Steffen Sledz wrote: > Hi meta-jav maintainers, > > this is a set of patches which make icedtea6-native-1.7.10 and > icedtea6-native-1.8.11 buildable for us. > > The following changes since commit da13c12203a4ba9020d7083861c0038c8ee67c88: > > openjdk-6: update to version 1.11.4 (2012-09-10 20:43:55 +0200) > > are available in the git repository at: > > git://github.com/sledz/meta-java pull-request-1 > https://github.com/sledz/meta-java/tree/pull-request-1 > > Steffen Sledz (5): > icedtea6-native-1.7.10: add missing LIC_FILES_CHKSUM > icedtea6-native-1.7.10: backport S7103224 > icedtea6-native: fix problem on build hosts with linux kernel 3.x > icedtea6-native: fix compile error > icedtea6-native: fix build problem Ping! -- DResearch Fahrzeugelektronik GmbH Otto-Schmirgal-Str. 3, 10319 Berlin, Germany Tel: +49 30 515932-237 mailto:sl...@dresearch-fe.de Fax: +49 30 515932-299 Geschäftsführer: Dr. Michael Weber, Werner Mögle; Amtsgericht Berlin Charlottenburg; HRB 130120 B; Ust.-IDNr. DE273952058 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] mysql: start at runlevel 5 not S
Without that change target system had to be restarted to get MySQL running or it had to be run by hand. Reason was simple: mysql init script was starting before S99configure when package was not yet configured. Signed-off-by: Marcin Juszkiewicz --- meta-oe/recipes-support/mysql/mysql5_5.1.40.inc |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc b/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc index 40b6b01..72e9ef8 100644 --- a/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc +++ b/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc @@ -5,7 +5,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=477ab0a4c8ca64b482b3f2a365d0fdfa" DEPENDS = "ncurses" -PR = "r8" +PR = "r9" SRC_URI = "http://downloads.mysql.com/archives/mysql-5.1/mysql-${PV}.tar.gz \ file://configure.in.patch \ @@ -26,7 +26,7 @@ inherit autotools binconfig update-rc.d INITSCRIPT_PACKAGES = "${PN}-server" INITSCRIPT_NAME = "mysqld" -INITSCRIPT_PARAMS = "start 45 S . stop 45 0 6 1 ." +INITSCRIPT_PARAMS = "start 45 5 . stop 45 0 6 1 ." export ac_cv_path_PS="/bin/ps" export ac_cv_FIND_PROC="/bin/ps p \$\$PID | grep -v grep | grep mysqld > /dev/null" -- 1.7.10.4 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] lmsensors: Initial commit.
The lmsensors project provides hardware health monitoring tools in the form of kernel drivers, a user-space library and some helper programs. This recipe provides all the different user-space tools offered by lmsensors in separete packages. Startup scripts and default configuration files are also made available through this commit. The packages consist of (description text from lmsensors documentation): * lmsensors-libsensors: The user-space sensors support library code. * lmsensors-sensors: A console tool to report sensor readings and set new sensor limits. * lmsensors-sensord: A daemon to watch sensor values and log problems. It includes RRD support. * lmsensors-fancontrol: Controls fanspeeds responding to changes on temperature sensors. Configuration through pwmconfig. * lmsensors-sensorsdetect: This program tries to detect the available SMBus adapters and the chips connected to them, as well as Super-I/O and misc chips. * lmsensors-sensorsconfconvert: Convert configuration files from lmsensorsv2 to lmsensorsv3. * lmsensors-pwmconfig: tests the pwm (pulse width modulation) outputs of sensors for their effect on the fans and helps to setup the configfile for fancontrol. * lmsensors-isatools: This program sets/gets the registers of ISA or Super-I/O chips. Signed-off-by: Marc Ferland --- .../recipes-support/lm_sensors/files/fancontrol|2 + .../recipes-support/lm_sensors/files/fancontrol.sh | 48 ++ .../recipes-support/lm_sensors/files/sensord.cgi | 10 ++ .../recipes-support/lm_sensors/files/sensord.conf | 16 ++ .../recipes-support/lm_sensors/files/sensord.sh| 49 +++ .../recipes-support/lm_sensors/files/sensors.conf |2 + .../recipes-support/lm_sensors/lmsensors_3.3.2.bb | 150 7 files changed, 277 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-support/lm_sensors/files/fancontrol create mode 100644 meta-oe/recipes-support/lm_sensors/files/fancontrol.sh create mode 100644 meta-oe/recipes-support/lm_sensors/files/sensord.cgi create mode 100644 meta-oe/recipes-support/lm_sensors/files/sensord.conf create mode 100644 meta-oe/recipes-support/lm_sensors/files/sensord.sh create mode 100644 meta-oe/recipes-support/lm_sensors/files/sensors.conf create mode 100644 meta-oe/recipes-support/lm_sensors/lmsensors_3.3.2.bb diff --git a/meta-oe/recipes-support/lm_sensors/files/fancontrol b/meta-oe/recipes-support/lm_sensors/files/fancontrol new file mode 100644 index 000..1f03a2b --- /dev/null +++ b/meta-oe/recipes-support/lm_sensors/files/fancontrol @@ -0,0 +1,2 @@ +# fancontrol configuration file. +# Place your device specific configuration in this file. diff --git a/meta-oe/recipes-support/lm_sensors/files/fancontrol.sh b/meta-oe/recipes-support/lm_sensors/files/fancontrol.sh new file mode 100644 index 000..f179310 --- /dev/null +++ b/meta-oe/recipes-support/lm_sensors/files/fancontrol.sh @@ -0,0 +1,48 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: fancontrol +# Required-Start:$local_fs +# Should-Start: +# Required-Stop: $local_fs +# Should-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: fancontrol initscript +# Description: Starts and controls the fancontrol daemon +### END INIT INFO + +PATH=/sbin:/usr/sbin:/bin:/usr/bin + +DESC="fan control daemon" +NAME="fancontrol" +FANCONTROL=`which $NAME` + +. /etc/init.d/functions || exit 1 + +# Exit if the package is not installed +[ -x "$FANCONTROL" ] || exit 0 + +case "$1" in +start) +echo -n "Starting $DESC: $NAME... " +/sbin/start-stop-daemon -S -x $FANCONTROL -b -- $FANCONTROL_ARGS +echo "done." +;; +stop) +echo -n "Stopping $DESC: $NAME... " +/sbin/start-stop-daemon -K -x $FANCONTROL +echo "done." +;; +restart) +echo "Restarting $DESC: $NAME... " +$0 stop +$0 start +echo "done." +;; +*) +echo "Usage: $0 {start|stop|restart}" +exit 1 +;; +esac + +exit 0 diff --git a/meta-oe/recipes-support/lm_sensors/files/sensord.cgi b/meta-oe/recipes-support/lm_sensors/files/sensord.cgi new file mode 100644 index 000..b1aad05 --- /dev/null +++ b/meta-oe/recipes-support/lm_sensors/files/sensord.cgi @@ -0,0 +1,10 @@ +#!/usr/bin/rrdcgi + + + +sensord + + +Generate a valid sensord.cgi script and install it in your BSP. + + diff --git a/meta-oe/recipes-support/lm_sensors/files/sensord.conf b/meta-oe/recipes-support/lm_sensors/files/sensord.conf new file mode 100644 index 000..6b48cf6 --- /dev/null +++ b/meta-oe/recipes-support/lm_sensors/files/sensord.conf @@ -0,0 +1,16 @@ +# Default sensord configuration file +# Syntax: sensord {options} {chips} +# -i, --interval -- interval between scanning alarms (default 60s) +# -l, --log-interval -- interval between logging sensors (default 30m) +# -t, --rrd-interval -- interval between updating RRD file (default 5m) +
[oe] [meta-oe][PATCH] lmsensors: Initial commit (cover letter).
Here's a second version of my patch for adding lmsensors. As suggested by Paul and Martin I've rebased my patch against meta-oe and dropped the rrdtool part. Regards, Marc Marc Ferland (1): lmsensors: Initial commit. .../recipes-support/lm_sensors/files/fancontrol|2 + .../recipes-support/lm_sensors/files/fancontrol.sh | 48 ++ .../recipes-support/lm_sensors/files/sensord.cgi | 10 ++ .../recipes-support/lm_sensors/files/sensord.conf | 16 ++ .../recipes-support/lm_sensors/files/sensord.sh| 49 +++ .../recipes-support/lm_sensors/files/sensors.conf |2 + .../recipes-support/lm_sensors/lmsensors_3.3.2.bb | 150 7 files changed, 277 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-support/lm_sensors/files/fancontrol create mode 100644 meta-oe/recipes-support/lm_sensors/files/fancontrol.sh create mode 100644 meta-oe/recipes-support/lm_sensors/files/sensord.cgi create mode 100644 meta-oe/recipes-support/lm_sensors/files/sensord.conf create mode 100644 meta-oe/recipes-support/lm_sensors/files/sensord.sh create mode 100644 meta-oe/recipes-support/lm_sensors/files/sensors.conf create mode 100644 meta-oe/recipes-support/lm_sensors/lmsensors_3.3.2.bb -- 1.7.5.4 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-webserver][PATCH v2] hiawatha: add initial 8.5 recipe and associated files
Hi Jack, On Monday 15 October 2012 13:45:04 Jack Mitchell wrote: > From: Jack Mitchell > > v1: > - hiawatha: add initial 8.5 recipe and associated files > > v2: > - update hiawatha init file with LSB headers > - use sed to put in correct sbin path > --- > .../recipes-httpd/hiawatha/files/hiawatha-init | 44 > + .../recipes-httpd/hiawatha/hiawatha_8.5.bb | > 45 ++ 2 files changed, 89 insertions(+) > create mode 100644 > meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init create mode > 100644 meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb I was all set to apply this and then I noticed the patch is missing signed-off- by. Sorry to be a pain but could you resend with Signed-off-by added and also move any revision comments underneath the -- line so they don't show up in the commit message? Thanks, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH] [meta-multimedia] gst123: add package
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Op 17-10-12 16:21, Ross Burton schreef: > gst123 is useful for testing as it simply uses PlayBin, but can display > the pipeline being used for QA purposes. > > Signed-off-by: Ross Burton --- > .../recipes-multimedia/gstreamer/gst123_0.3.1.bb| 19 > +++ 1 file changed, 19 insertions(+) create mode 100644 > meta-multimedia/recipes-multimedia/gstreamer/gst123_0.3.1.bb > > diff --git a/meta-multimedia/recipes-multimedia/gstreamer/gst123_0.3.1.bb > b/meta-multimedia/recipes-multimedia/gstreamer/gst123_0.3.1.bb new file > mode 100644 index 000..b543958 --- /dev/null +++ > b/meta-multimedia/recipes-multimedia/gstreamer/gst123_0.3.1.bb @@ -0,0 > +1,19 @@ +SUMMARY = "gst123" Can you add a more verbose summary please? > +DESCRIPTION = "Flexible command line player in the spirit of ogg123 and > mpg123, based on GStreamer" +HOMEPAGE = > "http://space.twc.de/~stefan/gst123.php"; +LICENSE = "LGPLv2.1+" > +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 > \ + > file://src/gst123.cc;beginline=1;endline=19;md5=05d2f5d54b985b986c26af931d2084f8" > > + > +DEPENDS = "libx11 gstreamer gtk+ ncurses" + +PR = "r0" And drop that, it's the default value. -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.5 (Darwin) Comment: GPGTools - http://gpgtools.org iD8DBQFQf6xwMkyGM64RGpERAljjAJ9aGC2Q5HRMTnFYOlcJb2ywBqIHwwCfRfh5 Luyj+s0dnDIfr77ziVYK7PE= =tMxI -END PGP SIGNATURE- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel