[meta-oe][PATCH 0/3] Smaller fixes

All of lore.kernel.org
 help / color / mirror / Atom feed

* [meta-oe][PATCH 0/3] Smaller fixes
@ 2012-09-22 15:07 Martin Jansa
  2012-09-22 15:07 ` [meta-oe][PATCH 1/3] gtk+: drop .bbappend with native BBCLASSEXTEND Martin Jansa
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Martin Jansa @ 2012-09-22 15:07 UTC (permalink / raw)
  To: openembedded-devel

The following changes since commit b232837c402cdbc5f2f1bd2afee5200df1383373:

  gnome-themes: inherit perlnative (2012-09-20 10:05:54 +0200)

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 (3):
  gtk+: drop .bbappend with native BBCLASSEXTEND
  lzma: replace oe.process.run with subprocess.call in do_unpack, drop
    NATIVE_INSTALL_WORKS
  emacs: fix X11DEPENDS and build without x11 enabled at all

 meta-gnome/recipes-gnome/gtk+/gtk+_2.24.8.bbappend |   3 -
 meta-oe/recipes-support/emacs/emacs.inc            | 114 ++++++++++++---------
 meta-oe/recipes-support/emacs/emacs_23.4.bb        |   2 +-
 meta-oe/recipes-support/lzma/lzma.inc              |   9 +-
 4 files changed, 68 insertions(+), 60 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/gtk+/gtk+_2.24.8.bbappend

-- 
1.7.12




^ permalink raw reply	[flat|nested] 4+ messages in thread

* [meta-oe][PATCH 1/3] gtk+: drop .bbappend with native BBCLASSEXTEND
  2012-09-22 15:07 [meta-oe][PATCH 0/3] Smaller fixes Martin Jansa
@ 2012-09-22 15:07 ` Martin Jansa
  2012-09-22 15:07 ` [meta-oe][PATCH 2/3] lzma: replace oe.process.run with subprocess.call in do_unpack, drop NATIVE_INSTALL_WORKS Martin Jansa
  2012-09-22 15:07 ` [meta-oe][PATCH 3/3] emacs: fix X11DEPENDS and build without x11 enabled at all Martin Jansa
  2 siblings, 0 replies; 4+ messages in thread
From: Martin Jansa @ 2012-09-22 15:07 UTC (permalink / raw)
  To: openembedded-devel

* it's in oe-core now

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/gtk+/gtk+_2.24.8.bbappend | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/gtk+/gtk+_2.24.8.bbappend

diff --git a/meta-gnome/recipes-gnome/gtk+/gtk+_2.24.8.bbappend b/meta-gnome/recipes-gnome/gtk+/gtk+_2.24.8.bbappend
deleted file mode 100644
index 7df58c3..0000000
--- a/meta-gnome/recipes-gnome/gtk+/gtk+_2.24.8.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-BBCLASSEXTEND = "native"
-RRECOMMENDS_${PN}_virtclass-native = ""
-EXTRA_OECONF_virtclass-native += "--disable-introspection"
-- 
1.7.12




^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [meta-oe][PATCH 2/3] lzma: replace oe.process.run with subprocess.call in do_unpack, drop NATIVE_INSTALL_WORKS
  2012-09-22 15:07 [meta-oe][PATCH 0/3] Smaller fixes Martin Jansa
  2012-09-22 15:07 ` [meta-oe][PATCH 1/3] gtk+: drop .bbappend with native BBCLASSEXTEND Martin Jansa
@ 2012-09-22 15:07 ` Martin Jansa
  2012-09-22 15:07 ` [meta-oe][PATCH 3/3] emacs: fix X11DEPENDS and build without x11 enabled at all Martin Jansa
  2 siblings, 0 replies; 4+ messages in thread
From: Martin Jansa @ 2012-09-22 15:07 UTC (permalink / raw)
  To: openembedded-devel

* oe.process was removed in
  http://git.openembedded.org/openembedded-core/commit/meta/lib/oe?id=d56062cbf92ef206bf06c767befacb66927a9a36

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/lzma/lzma.inc | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/meta-oe/recipes-support/lzma/lzma.inc b/meta-oe/recipes-support/lzma/lzma.inc
index 9718600..457d7f4 100644
--- a/meta-oe/recipes-support/lzma/lzma.inc
+++ b/meta-oe/recipes-support/lzma/lzma.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "LZMA is a general compression method. LZMA provides high compress
 HOMEPAGE = "http://www.7-zip.org/"
 LICENSE = "LGPL"
 LIC_FILES_CHKSUM = "file://lzma.txt;md5=20251cdc2e3793cceab11878d0aa11b1"
-INC_PR = "r6"
+INC_PR = "r7"
 
 SRC_URI = "http://downloads.sourceforge.net/sevenzip/lzma${@bb.data.getVar('PV',d,1).replace('.','')}.tar.bz2;subdir=${BPN}-${PV} \
            file://001-large_files.patch \
@@ -14,10 +14,10 @@ SRC_URI = "http://downloads.sourceforge.net/sevenzip/lzma${@bb.data.getVar('PV',
 EXTRA_OEMAKE = "-f makefile.gcc"
 
 do_unpack_append() {
-    import oe.process
+    import subprocess
     # Replace MS-DOS line-endings with Unix style line-endings
-    oe.process.run("find . -type f -print0 | xargs -0 sed 's/\r$//' -i",
-               cwd=d.getVar("S", True))
+    subprocess.call("find . -type f -print0 | xargs -0 sed 's/\r$//' -i",
+                     cwd=d.getVar("S", True), shell=True)
 }
 
 do_compile() {
@@ -32,5 +32,4 @@ do_install() {
         oe_libinstall -a -C C/LzmaUtil liblzma ${D}${libdir}
 }
 
-NATIVE_INSTALL_WORKS = "1"
 BBCLASSEXTEND = "native"
-- 
1.7.12




^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [meta-oe][PATCH 3/3] emacs: fix X11DEPENDS and build without x11 enabled at all
  2012-09-22 15:07 [meta-oe][PATCH 0/3] Smaller fixes Martin Jansa
  2012-09-22 15:07 ` [meta-oe][PATCH 1/3] gtk+: drop .bbappend with native BBCLASSEXTEND Martin Jansa
  2012-09-22 15:07 ` [meta-oe][PATCH 2/3] lzma: replace oe.process.run with subprocess.call in do_unpack, drop NATIVE_INSTALL_WORKS Martin Jansa
@ 2012-09-22 15:07 ` Martin Jansa
  2 siblings, 0 replies; 4+ messages in thread
From: Martin Jansa @ 2012-09-22 15:07 UTC (permalink / raw)
  To: openembedded-devel

* also added copy for libcroco
  librsvg is linked to it by default after
  http://git.openembedded.org/openembedded-core/commit/?id=e177f1475c55c7d0bf3e2752e6502a7e8577a075

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/emacs/emacs.inc     | 114 +++++++++++++++-------------
 meta-oe/recipes-support/emacs/emacs_23.4.bb |   2 +-
 2 files changed, 64 insertions(+), 52 deletions(-)

diff --git a/meta-oe/recipes-support/emacs/emacs.inc b/meta-oe/recipes-support/emacs/emacs.inc
index 61761e8..b7a7b75 100644
--- a/meta-oe/recipes-support/emacs/emacs.inc
+++ b/meta-oe/recipes-support/emacs/emacs.inc
@@ -8,7 +8,13 @@ DEPENDS += "qemu-native"
 
 DEPENDS +=" liblockfile"
 
-X11DEPENDS = "gtk+ libungif dbus"
+X11DEPENDS = " \
+  libice libsm atk cairo dbus expat libffi fontconfig freetype gconf giflib \
+  jpeg xz pixman libpng librsvg tiff libcroco \
+  libx11 libxau libxcomposite libxcursor libxdamage libxdmcp libxext libxfixes \
+  libxft libxpm libxrandr libxrender \
+  gdk-pixbuf glib-2.0 gtk+ pango libxcb \
+" 
 
 EXTRA_OECONF =  "--without-sound --with-crt-dir=${STAGING_LIBDIR} "
 
@@ -50,11 +56,24 @@ do_compile_prepend() {
 	if [ -e $treedir ];then
 		rm -rf $treedir
 	fi
+	
+	mkdir -p $treedir/${base_libdir}
+
+	if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so ]; then
+		cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so $treedir/${base_libdir}
+	fi
+	if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so.* ]; then
+		cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so.* $treedir/${base_libdir}
+	fi
+	# stupid hack, but without it, it tries to use /usr/lib/libc.so from host and fails
+	# temacs: error while loading shared libraries: /usr/lib/libc.so: ELF file version does not match current one
+	if [ ! -f $treedir/${base_libdir}/libc.so ]; then
+		ln -s libc.so.6 $treedir/${base_libdir}/libc.so
+	fi
 
 	# copy only as much stuff as we need
 	# before: 5.5G   ../../qemu-treedir/
-	# after:   86M   ../../qemu-treedir/
-	mkdir -p $treedir/${base_libdir}
+	# after:   17M   ../../qemu-treedir/
 	cp -pPR \
 	${STAGING_DIR_TARGET}/${base_libdir}/ld-* \
 	${STAGING_DIR_TARGET}/${base_libdir}/libc.* \
@@ -65,57 +84,50 @@ do_compile_prepend() {
 	${STAGING_DIR_TARGET}/${base_libdir}/libresolv* \
 	${STAGING_DIR_TARGET}/${base_libdir}/libdl* \
 	${STAGING_DIR_TARGET}/${base_libdir}/librt* \
-	${STAGING_DIR_TARGET}/${base_libdir}/libresolv* \
 	${STAGING_DIR_TARGET}/${base_libdir}/libgcc_s.so.* \
-	${STAGING_DIR_TARGET}/${base_libdir}/libuuid.so.* \
 	${STAGING_DIR_TARGET}/${base_libdir}/libpthread* $treedir/${base_libdir}/
 
-	cp -pPR \
-	${STAGING_DIR_TARGET}/${libdir}/libICE.so.* \
-	${STAGING_DIR_TARGET}/${libdir}/libSM.so.* \
-	${STAGING_DIR_TARGET}/${libdir}/libatk-1.0.so.* \
-	${STAGING_DIR_TARGET}/${libdir}/libcairo.so.* \
-	${STAGING_DIR_TARGET}/${libdir}/libdbus-1.so.* \
-	${STAGING_DIR_TARGET}/${libdir}/libdbus-glib-1.so.* \
-	${STAGING_DIR_TARGET}/${libdir}/libexpat.so.* \
-	${STAGING_DIR_TARGET}/${libdir}/libffi.so.* \
-	${STAGING_DIR_TARGET}/${libdir}/libfontconfig.so.* \
-	${STAGING_DIR_TARGET}/${libdir}/libfreetype.so.* \
-	${STAGING_DIR_TARGET}/${libdir}/libgconf-2.so.* \
-	${STAGING_DIR_TARGET}/${libdir}/libgif.so.* \
-	${STAGING_DIR_TARGET}/${libdir}/libjpeg.so.* \
-	${STAGING_DIR_TARGET}/${libdir}/liblzma.so.* \
-	${STAGING_DIR_TARGET}/${libdir}/libpixman-1.so.* \
-	${STAGING_DIR_TARGET}/${libdir}/libpng12.so.* \
-	${STAGING_DIR_TARGET}/${libdir}/librsvg-2.so.* \
-	${STAGING_DIR_TARGET}/${libdir}/libstdc++.so.* \
-	${STAGING_DIR_TARGET}/${libdir}/libtiff.so.* \
-	${STAGING_DIR_TARGET}/${libdir}/libxml2.so.* \
-	${STAGING_DIR_TARGET}/${libdir}/libz.so.* $treedir/${base_libdir}/
-
-	# X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xft Xpm Xrandr Xrender
-	cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libX*.so.* $treedir/${base_libdir}/
-
-	# gdk-x11 gdk_pixbuf gio glib gmodule gobject gthread gtk-x11
-	cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libg*-2.0.so.* $treedir/${base_libdir}/
-
-	# pango pangocairo pangoft2
-	cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libpango*-1.0.so.* $treedir/${base_libdir}/
-
-	# xcb-render xcb-shm xcb
-	cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libxcb*.so.* $treedir/${base_libdir}/
-
-	#cp -pPR ${STAGING_DIR_TARGET}/* $treedir
-	if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so ]; then
-		cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so $treedir/lib
-	fi
-	if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so.* ]; then
-		cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so.* $treedir/lib
-	fi
-	# stupid hack, but without it, it tries to use /usr/lib/libc.so from host and fails
-	# temacs: error while loading shared libraries: /usr/lib/libc.so: ELF file version does not match current one
-	if [ ! -f $treedir/${base_libdir}/libc.so ]; then
-		ln -s libc.so.6 $treedir/${base_libdir}/libc.so
+	if [ ! -z "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" ] ; then
+		echo "X11 build enabled"
+		# copy only as much stuff as we need
+		# before: 5.5G   ../../qemu-treedir/
+		# after:   86M   ../../qemu-treedir/
+		cp -pPR \
+		${STAGING_DIR_TARGET}/${base_libdir}/libuuid.so.* \
+		${STAGING_DIR_TARGET}/${libdir}/libICE.so.* \
+		${STAGING_DIR_TARGET}/${libdir}/libSM.so.* \
+		${STAGING_DIR_TARGET}/${libdir}/libatk-1.0.so.* \
+		${STAGING_DIR_TARGET}/${libdir}/libcairo.so.* \
+		${STAGING_DIR_TARGET}/${libdir}/libdbus-1.so.* \
+		${STAGING_DIR_TARGET}/${libdir}/libdbus-glib-1.so.* \
+		${STAGING_DIR_TARGET}/${libdir}/libexpat.so.* \
+		${STAGING_DIR_TARGET}/${libdir}/libffi.so.* \
+		${STAGING_DIR_TARGET}/${libdir}/libfontconfig.so.* \
+		${STAGING_DIR_TARGET}/${libdir}/libfreetype.so.* \
+		${STAGING_DIR_TARGET}/${libdir}/libgconf-2.so.* \
+		${STAGING_DIR_TARGET}/${libdir}/libgif.so.* \
+		${STAGING_DIR_TARGET}/${libdir}/libjpeg.so.* \
+		${STAGING_DIR_TARGET}/${libdir}/liblzma.so.* \
+		${STAGING_DIR_TARGET}/${libdir}/libpixman-1.so.* \
+		${STAGING_DIR_TARGET}/${libdir}/libpng12.so.* \
+		${STAGING_DIR_TARGET}/${libdir}/librsvg-2.so.* \
+		${STAGING_DIR_TARGET}/${libdir}/libstdc++.so.* \
+		${STAGING_DIR_TARGET}/${libdir}/libtiff.so.* \
+		${STAGING_DIR_TARGET}/${libdir}/libxml2.so.* \
+		${STAGING_DIR_TARGET}/${libdir}/libcroco-0.6.so.* \
+		${STAGING_DIR_TARGET}/${libdir}/libz.so.* $treedir/${base_libdir}/
+
+		# X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xft Xpm Xrandr Xrender
+		cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libX*.so.* $treedir/${base_libdir}/
+
+		# gdk-x11 gdk_pixbuf gio glib gmodule gobject gthread gtk-x11
+		cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libg*-2.0.so.* $treedir/${base_libdir}/
+
+		# pango pangocairo pangoft2
+		cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libpango*-1.0.so.* $treedir/${base_libdir}/
+
+		# xcb-render xcb-shm xcb
+		cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libxcb*.so.* $treedir/${base_libdir}/
 	fi
 }
 
diff --git a/meta-oe/recipes-support/emacs/emacs_23.4.bb b/meta-oe/recipes-support/emacs/emacs_23.4.bb
index 65cc3a3..5ad5644 100644
--- a/meta-oe/recipes-support/emacs/emacs_23.4.bb
+++ b/meta-oe/recipes-support/emacs/emacs_23.4.bb
@@ -1,6 +1,6 @@
 require emacs.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz;name=tarball \
            file://use-qemu.patch \
-- 
1.7.12




^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2012-09-22 15:20 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-22 15:07 [meta-oe][PATCH 0/3] Smaller fixes Martin Jansa
2012-09-22 15:07 ` [meta-oe][PATCH 1/3] gtk+: drop .bbappend with native BBCLASSEXTEND Martin Jansa
2012-09-22 15:07 ` [meta-oe][PATCH 2/3] lzma: replace oe.process.run with subprocess.call in do_unpack, drop NATIVE_INSTALL_WORKS Martin Jansa
2012-09-22 15:07 ` [meta-oe][PATCH 3/3] emacs: fix X11DEPENDS and build without x11 enabled at all Martin Jansa

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.