diff options
| -rw-r--r-- | conf/checksums.ini | 4 | ||||
| -rw-r--r-- | conf/machine/include/tune-strongarm.inc | 1 | ||||
| -rw-r--r-- | recipes/busybox/busybox-1.11.3/iptunnel.patch | 11 | ||||
| -rw-r--r-- | recipes/busybox/busybox.inc | 2 | ||||
| -rw-r--r-- | recipes/busybox/busybox_1.11.3.bb | 1 | ||||
| -rw-r--r-- | recipes/gstreamer/gst-plugins.inc | 4 | ||||
| -rw-r--r-- | recipes/xfce-base/xfce4-panel_4.6.2.bb | 31 |
7 files changed, 51 insertions, 3 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 3617415c15..57a7161eb5 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -29002,6 +29002,10 @@ sha256=b308ddc96fcb27b3f18ed2fa20aeb3a12fb73cec7676d75914a58d1b27124b83 md5=73a366b9892152266b465d7d9c35bef4 sha256=b308ddc96fcb27b3f18ed2fa20aeb3a12fb73cec7676d75914a58d1b27124b83 +[http://mocha.xfce.org/archive/src/xfce/xfce4-panel/4.6/xfce4-panel-4.6.2.tar.bz2] +md5=88352816c84cbea57121b0c478976976 +sha256=1d8ab1354c73935a5d12f0d7d226d26ae1b90fdd235460bdb57fd5651229bc8b + [http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-session-4.4.2.tar.bz2] md5=4c3d1acb8ce37ea4dd55d82aeb38e9e7 sha256=7394906dec7b50789407219f85143ae83b10938949d38adeecdd59eb50c8c1c6 diff --git a/conf/machine/include/tune-strongarm.inc b/conf/machine/include/tune-strongarm.inc index fc4737999d..fe57c9ccc0 100644 --- a/conf/machine/include/tune-strongarm.inc +++ b/conf/machine/include/tune-strongarm.inc @@ -5,3 +5,4 @@ TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm" FEED_ARCH = "armv4" BASE_PACKAGE_ARCH = "armv4" +PACKAGE_EXTRA_ARCHS += "armv4" diff --git a/recipes/busybox/busybox-1.11.3/iptunnel.patch b/recipes/busybox/busybox-1.11.3/iptunnel.patch new file mode 100644 index 0000000000..18734fc527 --- /dev/null +++ b/recipes/busybox/busybox-1.11.3/iptunnel.patch @@ -0,0 +1,11 @@ +diff -Nurd busybox-1.11.3.orig//networking/libiproute/iptunnel.c busybox-1.11.3/networking/libiproute/iptunnel.c +--- busybox-1.11.3.orig//networking/libiproute/iptunnel.c 2009-10-29 12:49:58.000000000 +0100 ++++ busybox-1.11.3/networking/libiproute/iptunnel.c 2009-10-29 12:50:33.000000000 +0100 +@@ -21,6 +21,7 @@ + #ifndef __constant_htons + #define __constant_htons htons + #endif ++#include <asm/byteorder.h> + #include <linux/if_tunnel.h> + + #include "ip_common.h" /* #include "libbb.h" is inside */ diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc index 0ff65a41bc..753b402bee 100644 --- a/recipes/busybox/busybox.inc +++ b/recipes/busybox/busybox.inc @@ -11,7 +11,7 @@ LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -INC_PR = "r22" +INC_PR = "r23" SRC_URI = "\ http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ diff --git a/recipes/busybox/busybox_1.11.3.bb b/recipes/busybox/busybox_1.11.3.bb index 293608bcb3..0ec753f951 100644 --- a/recipes/busybox/busybox_1.11.3.bb +++ b/recipes/busybox/busybox_1.11.3.bb @@ -7,6 +7,7 @@ SRC_URI = "\ file://udhcpscript.patch;patch=1 \ file://B921600.patch;patch=1 \ file://fdisk_lineedit_segfault.patch;patch=1 \ + file://iptunnel.patch;patch=1 \ file://busybox-appletlib-dependency.patch;patch=1 \ file://busybox-cron \ file://busybox-httpd \ diff --git a/recipes/gstreamer/gst-plugins.inc b/recipes/gstreamer/gst-plugins.inc index 5d72eb8d02..9b69f3a609 100644 --- a/recipes/gstreamer/gst-plugins.inc +++ b/recipes/gstreamer/gst-plugins.inc @@ -3,7 +3,7 @@ DESCRIPTION = "Plugins for GStreamer" DEPENDS = "gstreamer libmikmod liboil libogg tremor libvorbis" DEPENDS += "${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag', d)}" -INC_PR = "r6" +INC_PR = "r7" PACKAGES_DYNAMIC = "gst-plugin-*" @@ -35,7 +35,7 @@ python populate_packages_prepend () { metapkg_rdepends = [] packages = bb.data.getVar('PACKAGES', d, 1).split() for pkg in packages[1:]: - if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.count('locale'): + if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.count('locale') and not pkg.count('-static'): metapkg_rdepends.append(pkg) bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d) bb.data.setVar('DESCRIPTION_' + metapkg, pn + ' meta package', d) diff --git a/recipes/xfce-base/xfce4-panel_4.6.2.bb b/recipes/xfce-base/xfce4-panel_4.6.2.bb new file mode 100644 index 0000000000..403dc71dbc --- /dev/null +++ b/recipes/xfce-base/xfce4-panel_4.6.2.bb @@ -0,0 +1,31 @@ +# xfce4-panel OE build file + +DESCRIPTION = "Xfce4 Panel" +DEPENDS = "virtual/libx11 startup-notification libxfcegui4 libxml2 exo libwnck" +SECTION = "x11" +PR = "r1" + +inherit xfce46 + +EXTRA_OECONF += " --enable-startup-notification" + +do_stage() { + autotools_stage_all +} + +do_install() { + oe_runmake DESTDIR=${D} install +} + +python populate_packages_prepend() { + plugin_dir = bb.data.expand('${libdir}/xfce4/panel-plugins/', d) + plugin_name = bb.data.expand('${PN}-plugin-%s', d) + do_split_packages(d, plugin_dir, '^lib(.*).so$', plugin_name, + '${PN} plugin for %s', extra_depends='', prepend=True, + aux_files_pattern=['${datadir}/xfce4/panel-plugins/%s.desktop', + '${sysconfdir}/xdg/xfce/panel/%s-*', + '${datadir}/icons/hicolor/48x48/apps/*-%s.png', + '${bindir}/*%s*']) +} + +PACKAGES_DYNAMIC = "${PN}-plugin-*" |