* [PATCH 1/5] packagegroup-qte-toolchain-target: exclude from world
2013-01-29 12:29 [PATCH 0/5] world-image fixes Martin Jansa
@ 2013-01-29 12:29 ` Martin Jansa
2013-01-29 12:29 ` [PATCH 2/5] vim: implement gvim, vim-tiny as PACKAGECONFIG Martin Jansa
` (3 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Martin Jansa @ 2013-01-29 12:29 UTC (permalink / raw)
To: openembedded-devel
* add comment why qwt-e is excluded
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../packagegroups/packagegroup-qte-toolchain-target.bbappend | 3 +++
meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb | 2 ++
2 files changed, 5 insertions(+)
diff --git a/meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend b/meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend
index f379101..f6e5dd9 100644
--- a/meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend
+++ b/meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend
@@ -1,3 +1,6 @@
RDEPENDS_${PN} += "qwt-e-dev"
+# qwt-e conflicts with qwt, so only one can be built in world and this pulls qwt-e
+EXCLUDE_FROM_WORLD = "1"
+
PRINC := "${@int(PRINC) + 1}"
diff --git a/meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb b/meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb
index 6a80136..c801309 100644
--- a/meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb
+++ b/meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb
@@ -9,4 +9,6 @@ SRC_URI[qwt.sha256sum] = "3fe19dd5962d705632fc2ef616b009299de6cf1e702538296924db
RPROVIDES_${PN}-dev = "libqwt-dev"
+# Conflicts with qwt, only one qwt* can be built in world
+# | Project ERROR: local build will conflict with sysroots/qemuarm/usr/lib/libqwt.*
EXCLUDE_FROM_WORLD = "1"
--
1.8.1.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 2/5] vim: implement gvim, vim-tiny as PACKAGECONFIG
2013-01-29 12:29 [PATCH 0/5] world-image fixes Martin Jansa
2013-01-29 12:29 ` [PATCH 1/5] packagegroup-qte-toolchain-target: exclude from world Martin Jansa
@ 2013-01-29 12:29 ` Martin Jansa
2013-01-29 12:29 ` [PATCH 3/5] move broken recipes to nonworking directories Martin Jansa
` (2 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Martin Jansa @ 2013-01-29 12:29 UTC (permalink / raw)
To: openembedded-devel
* only one of those should be built in sysroot, otherwise they were
overwritting files provided by other alternatives
* define PACKAGECONFIG options
* there are no RCONFLICTS/RREPLACES/RPROVIDES, because it depends on
selected PACKAGECONFIGs
* add PN to VIMDIR and use VIMDIR where undefined VIMVER was
(e.g. "${PN}${VIMVER}")
* move checksums from .inc to recipe
* vim/gvim/vim-tiny conflict is now fatal, with
http://patches.openembedded.org/patch/43105/
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-support/vim/gvim_7.2.446.bb | 14 --------
meta-oe/recipes-support/vim/vim-tiny_7.2.446.bb | 11 ------
meta-oe/recipes-support/vim/vim.inc | 47 +++++++++++--------------
meta-oe/recipes-support/vim/vim_7.2.446.bb | 31 +++++-----------
4 files changed, 30 insertions(+), 73 deletions(-)
delete mode 100644 meta-oe/recipes-support/vim/gvim_7.2.446.bb
delete mode 100644 meta-oe/recipes-support/vim/vim-tiny_7.2.446.bb
diff --git a/meta-oe/recipes-support/vim/gvim_7.2.446.bb b/meta-oe/recipes-support/vim/gvim_7.2.446.bb
deleted file mode 100644
index fbc763a..0000000
--- a/meta-oe/recipes-support/vim/gvim_7.2.446.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-VIMGUI = "gtk2"
-VIMX = "--with-x"
-
-require vim_${PV}.bb
-
-PR = "${INC_PR}.4"
-
-DEPENDS += "gtk+ xt"
-
-FILES_${PN} += "${datadir}/vim"
-
-EXTRA_OECONF += "--enable-gtk2-test"
-
-RREPLACES_${PN} = "vim vim-tiny"
diff --git a/meta-oe/recipes-support/vim/vim-tiny_7.2.446.bb b/meta-oe/recipes-support/vim/vim-tiny_7.2.446.bb
deleted file mode 100644
index d29b801..0000000
--- a/meta-oe/recipes-support/vim/vim-tiny_7.2.446.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-VIMFEATURES = "tiny"
-
-require vim_${PV}.bb
-
-PR = "${INC_PR}.4"
-
-RCONFLICTS_${PN} = "gvim vim"
-
-PACKAGES =+ "${PN}-data"
-
-FILES_${PN}-data = "${datadir}/vim"
diff --git a/meta-oe/recipes-support/vim/vim.inc b/meta-oe/recipes-support/vim/vim.inc
index 16ca58d..ca36bf1 100644
--- a/meta-oe/recipes-support/vim/vim.inc
+++ b/meta-oe/recipes-support/vim/vim.inc
@@ -7,17 +7,18 @@ LICENSE = "vim"
LIC_FILES_CHKSUM = "file://README.txt;md5=72c4840d07b65659b60b3fa405c7da36"
PV_MAJOR = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
-VIMDIR = "${@d.getVar('PV',1).split('.')[0]}${@d.getVar('PV',1).split('.')[1]}"
+VIMDIR = "${PN}${@d.getVar('PV',1).split('.')[0]}${@d.getVar('PV',1).split('.')[1]}"
-INC_PR = "r11"
+INC_PR = "r12"
SRC_URI = " \
- ftp://ftp.vim.org/pub/vim/unix/vim-${PV_MAJOR}.tar.bz2;name=vim${PV_MAJOR}tarbz2 \
- ftp://ftp.vim.org/pub/vim/extra/vim-${PV_MAJOR}-extra.tar.gz;name=vim${PV_MAJOR}extratargz \
- ftp://ftp.vim.org/pub/vim/extra/vim-${PV_MAJOR}-lang.tar.gz;name=vim${PV_MAJOR}langtargz \
+ ftp://ftp.${PN}.org/pub/${PN}/unix/${PN}-${PV_MAJOR}.tar.bz2;name=${VIMDIR} \
+ ftp://ftp.${PN}.org/pub/${PN}/extra/${PN}-${PV_MAJOR}-extra.tar.gz;name=${VIMDIR}-extra \
+ ftp://ftp.${PN}.org/pub/${PN}/extra/${PN}-${PV_MAJOR}-lang.tar.gz;name=${VIMDIR}-lang \
+ file://vimrc \
"
-S = "${WORKDIR}/vim${VIMDIR}/src"
+S = "${WORKDIR}/${VIMDIR}/src"
inherit autotools update-alternatives
@@ -32,16 +33,14 @@ do_configure () {
touch auto/config.mk auto/config.h
}
+#Available PACKAGECONFIG options are gtkgui, x11, tiny
+PACKAGECONFIG ??= ""
-
-VIMFEATURES ?= "big"
-VIMX ?= "--without-x"
-VIMGUI ?= "no"
+PACKAGECONFIG[gtkgui] = "--enable-gtk2-test --enable-gui=gtk2,--enable-gui=no,gtk+,"
+PACKAGECONFIG[x11] = "--with-x,--without-x,xt,"
+PACKAGECONFIG[tiny] = "--with-features=tiny,--with-features=big,,"
EXTRA_OECONF = " \
- --enable-gui=${VIMGUI} \
- --with-features=${VIMFEATURES} \
- ${VIMX} \
--disable-gpm \
--disable-gtktest \
--disable-xim \
@@ -59,24 +58,20 @@ EXTRA_OECONF = " \
# Work around rpm picking up csh as a dep
do_install_append() {
- chmod -x ${D}${datadir}/vim/vim72/tools/vim132
+ chmod -x ${D}${datadir}/${PN}/${VIMDIR}/tools/vim132
+ install -m 0644 ${WORKDIR}/vimrc ${D}/${datadir}/${PN}
}
-PACKAGES =+ "vim-common vim-syntax vim-help vim-tutor"
-FILES_vim-syntax = "${datadir}/vim/vim${VIMVER}/syntax"
-FILES_vim-help = "${datadir}/vim/vim${VIMVER}/doc"
-FILES_vim-tutor = "${datadir}/vim/vim${VIMVER}/tutor ${bindir}/vimtutor"
+PACKAGES =+ "${PN}-common ${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-data"
+FILES_${PN}-syntax = "${datadir}/${PN}/${VIMDIR}/syntax"
+FILES_${PN}-help = "${datadir}/${PN}/${VIMDIR}/doc"
+FILES_${PN}-tutor = "${datadir}/${PN}/${VIMDIR}/tutor ${bindir}/${PN}tutor"
+FILES_${PN}-vimrc = "${datadir}/${PN}/vimrc"
+FILES_${PN}-data = "${datadir}/${PN}"
ALTERNATIVE_NAME = "vi"
-ALTERNATIVE_PATH = "${bindir}/vim"
+ALTERNATIVE_PATH = "${bindir}/${PN}"
ALTERNATIVE_LINK = "${base_bindir}/vi"
ALTERNATIVE_PRIORITY = "100"
-SRC_URI[vim7.2tarbz2.md5sum] = "f0901284b338e448bfd79ccca0041254"
-SRC_URI[vim7.2tarbz2.sha256sum] = "914db0f2205ebd6f02878295ec2506036ea7500399db112c61a01491cd9a1d86"
-SRC_URI[vim7.2langtargz.md5sum] = "d8884786979e0e520c112faf2e176f05"
-SRC_URI[vim7.2langtargz.sha256sum] = "11607f539a4518b550bf1606b7d3a6f36c1ffdf566c058e7d94bced78034cd5b"
-SRC_URI[vim7.2extratargz.md5sum] = "35e04482f07c57221c9a751aaa3b8dac"
-SRC_URI[vim7.2extratargz.sha256sum] = "20894ac79672160bfc4f1d2f9f9775b34d944762d655307a91ca96d358faa04d"
-
PARALLEL_MAKE = ""
diff --git a/meta-oe/recipes-support/vim/vim_7.2.446.bb b/meta-oe/recipes-support/vim/vim_7.2.446.bb
index 62d76d7..ef9f3c9 100644
--- a/meta-oe/recipes-support/vim/vim_7.2.446.bb
+++ b/meta-oe/recipes-support/vim/vim_7.2.446.bb
@@ -1,15 +1,6 @@
-# vim-tiny sets that too
-VIMFEATURES ?= "big"
+require ${PN}.inc
-# GUI type - gvim recipe sets "gtk2"
-VIMGUI ?= "no"
-
-# gvim recipes uses "--with-x"
-VIMX ?= "--without-x"
-
-require vim.inc
-
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.0"
# 001-446; 401-446 are not yet available online
SRC_URI += "http://ftp.vim.org/pub/vim/patches/7.2/7.2.001-100.gz;name=p001-100;apply=yes;patchdir=..;pnum=0"
@@ -18,6 +9,13 @@ SRC_URI += "http://ftp.vim.org/pub/vim/patches/7.2/7.2.201-300.gz;name=p201-300;
SRC_URI += "http://ftp.vim.org/pub/vim/patches/7.2/7.2.301-400.gz;name=p301-400;apply=yes;patchdir=..;pnum=0"
SRC_URI += "file://401-446.diff;patchdir=..;pnum=0"
+SRC_URI[vim72.md5sum] = "f0901284b338e448bfd79ccca0041254"
+SRC_URI[vim72.sha256sum] = "914db0f2205ebd6f02878295ec2506036ea7500399db112c61a01491cd9a1d86"
+SRC_URI[vim72-lang.md5sum] = "d8884786979e0e520c112faf2e176f05"
+SRC_URI[vim72-lang.sha256sum] = "11607f539a4518b550bf1606b7d3a6f36c1ffdf566c058e7d94bced78034cd5b"
+SRC_URI[vim72-extra.md5sum] = "35e04482f07c57221c9a751aaa3b8dac"
+SRC_URI[vim72-extra.sha256sum] = "20894ac79672160bfc4f1d2f9f9775b34d944762d655307a91ca96d358faa04d"
+
SRC_URI[p001-100.md5sum] = "ba91b19374cee90f71b8f4ab1d92dc0f"
SRC_URI[p001-100.sha256sum] = "519f4fea460e4f7a737ea8006c0dc1684982f8372d1581fb963a5d58f8007f67"
SRC_URI[p101-200.md5sum] = "b485233d360041d043c56cd99057dbff"
@@ -28,14 +26,3 @@ SRC_URI[p301-400.md5sum] = "137b5821ff4a2266796d14d867be5f9f"
SRC_URI[p301-400.sha256sum] = "41f022ec829786a008685c0b00acf8be09525755a94a06236a4b879b1f84b5f4"
SRC_URI += "file://configure.in_remove_CC_quotes.patch;patchdir=.."
-SRC_URI += "file://vimrc"
-
-do_install_append() {
- install -m 0644 ${WORKDIR}/vimrc ${D}/${datadir}/vim
-}
-
-RCONFLICTS_${PN} = "gvim"
-RREPLACES_${PN} = "vim-tiny"
-PACKAGES =+ "${PN}-vimrc"
-
-FILES_${PN}-vimrc = "${datadir}/vim/vimrc"
--
1.8.1.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 3/5] move broken recipes to nonworking directories
2013-01-29 12:29 [PATCH 0/5] world-image fixes Martin Jansa
2013-01-29 12:29 ` [PATCH 1/5] packagegroup-qte-toolchain-target: exclude from world Martin Jansa
2013-01-29 12:29 ` [PATCH 2/5] vim: implement gvim, vim-tiny as PACKAGECONFIG Martin Jansa
@ 2013-01-29 12:29 ` Martin Jansa
2013-01-29 13:02 ` Koen Kooi
2013-01-29 12:29 ` [PATCH 4/5] gnome-panel3: exclude from world Martin Jansa
2013-01-29 12:29 ` [PATCH 5/5] vim: use new u-a syntax Martin Jansa
4 siblings, 1 reply; 10+ messages in thread
From: Martin Jansa @ 2013-01-29 12:29 UTC (permalink / raw)
To: openembedded-devel
* this set does not build with distroless qemuarm as reported in
'State of bitbake world' thread, nobody volunteered to fix them
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch | 0
meta-gnome/recipes-gnome/{ => nonworking}/gnome/gnome-terminal_2.26.3.bb | 0
.../system-tools/system-tools-backends-2.10.2/add-angstrom-distro.patch | 0
.../system-tools/system-tools-backends-2.10.2/system-tools-backends | 0
.../{ => nonworking}/system-tools/system-tools-backends_2.10.2.bb | 0
.../0001-ide-use-node-as-interpreter-for-sketches-instead-of-.patch | 0
.../recipes-devtools/{ => nonworking}/cloud9/cloud9/cloud9-avahi.service | 0
meta-oe/recipes-devtools/{ => nonworking}/cloud9/cloud9/index.js | 0
meta-oe/recipes-devtools/{ => nonworking}/cloud9/cloud9_0.6.bb | 0
.../{ => nonworking}/nodejs/nodejs/fix-hardfloat-detection.patch | 0
meta-oe/recipes-devtools/{ => nonworking}/nodejs/nodejs_0.6.20.bb | 0
meta-oe/recipes-graphics/{ => nonworking}/fbida/fbida_2.08.bb | 0
.../slim/slim/0002-Fix-image-handling-integer-overflows.patch | 0
.../slim/slim/0003-Fix-build-failure-with-ld-as-needed.patch | 0
.../{ => nonworking}/slim/slim/0004-Add-support-libpng15.patch | 0
.../slim/slim/0005-Remove-path-of-gcc-amd-g-and-version-of-g.patch | 0
.../slim/slim/0006-Remove-localhost-from-Authenticator-of-pam.patch | 0
.../{ => nonworking}/slim/slim/0007-Fix-tty-slowness.patch | 0
.../{ => nonworking}/slim/slim/0008-restart-Xserver-if-killed.patch | 0
meta-oe/recipes-graphics/{ => nonworking}/slim/slim/Makefile.oe | 0
meta-oe/recipes-graphics/{ => nonworking}/slim/slim/slim-dynwm | 0
meta-oe/recipes-graphics/{ => nonworking}/slim/slim/slim.pamd | 0
meta-oe/recipes-graphics/{ => nonworking}/slim/slim/slim.service | 0
meta-oe/recipes-graphics/{ => nonworking}/slim/slim/update_slim_wmlist | 0
meta-oe/recipes-graphics/{ => nonworking}/slim/slim_1.3.2.bb | 0
meta-oe/recipes-support/{ => nonworking}/fftw/benchfft_3.1.bb | 0
meta-oe/recipes-support/{ => nonworking}/syslog-ng/files/initscript | 0
meta-oe/recipes-support/{ => nonworking}/syslog-ng/files/syslog-ng.conf | 0
meta-oe/recipes-support/{ => nonworking}/syslog-ng/syslog-ng.inc | 0
meta-oe/recipes-support/{ => nonworking}/syslog-ng/syslog-ng_3.2.5.bb | 0
.../recipes-devtools/{ => nonworking}/cloud9/cloud9/cloud9.service | 0
.../meta-oe/recipes-devtools/{ => nonworking}/cloud9/cloud9_0.6.bbappend | 0
.../recipes-support/{ => nonworking}/syslog-ng/syslog-ng_3.2.5.bbappend | 0
33 files changed, 0 insertions(+), 0 deletions(-)
rename meta-gnome/recipes-gnome/{ => nonworking}/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch (100%)
rename meta-gnome/recipes-gnome/{ => nonworking}/gnome/gnome-terminal_2.26.3.bb (100%)
rename meta-gnome/recipes-gnome/{ => nonworking}/system-tools/system-tools-backends-2.10.2/add-angstrom-distro.patch (100%)
rename meta-gnome/recipes-gnome/{ => nonworking}/system-tools/system-tools-backends-2.10.2/system-tools-backends (100%)
rename meta-gnome/recipes-gnome/{ => nonworking}/system-tools/system-tools-backends_2.10.2.bb (100%)
rename meta-oe/recipes-devtools/{ => nonworking}/cloud9/cloud9/0001-ide-use-node-as-interpreter-for-sketches-instead-of-.patch (100%)
rename meta-oe/recipes-devtools/{ => nonworking}/cloud9/cloud9/cloud9-avahi.service (100%)
rename meta-oe/recipes-devtools/{ => nonworking}/cloud9/cloud9/index.js (100%)
rename meta-oe/recipes-devtools/{ => nonworking}/cloud9/cloud9_0.6.bb (100%)
rename meta-oe/recipes-devtools/{ => nonworking}/nodejs/nodejs/fix-hardfloat-detection.patch (100%)
rename meta-oe/recipes-devtools/{ => nonworking}/nodejs/nodejs_0.6.20.bb (100%)
rename meta-oe/recipes-graphics/{ => nonworking}/fbida/fbida_2.08.bb (100%)
rename meta-oe/recipes-graphics/{ => nonworking}/slim/slim/0002-Fix-image-handling-integer-overflows.patch (100%)
rename meta-oe/recipes-graphics/{ => nonworking}/slim/slim/0003-Fix-build-failure-with-ld-as-needed.patch (100%)
rename meta-oe/recipes-graphics/{ => nonworking}/slim/slim/0004-Add-support-libpng15.patch (100%)
rename meta-oe/recipes-graphics/{ => nonworking}/slim/slim/0005-Remove-path-of-gcc-amd-g-and-version-of-g.patch (100%)
rename meta-oe/recipes-graphics/{ => nonworking}/slim/slim/0006-Remove-localhost-from-Authenticator-of-pam.patch (100%)
rename meta-oe/recipes-graphics/{ => nonworking}/slim/slim/0007-Fix-tty-slowness.patch (100%)
rename meta-oe/recipes-graphics/{ => nonworking}/slim/slim/0008-restart-Xserver-if-killed.patch (100%)
rename meta-oe/recipes-graphics/{ => nonworking}/slim/slim/Makefile.oe (100%)
rename meta-oe/recipes-graphics/{ => nonworking}/slim/slim/slim-dynwm (100%)
rename meta-oe/recipes-graphics/{ => nonworking}/slim/slim/slim.pamd (100%)
rename meta-oe/recipes-graphics/{ => nonworking}/slim/slim/slim.service (100%)
rename meta-oe/recipes-graphics/{ => nonworking}/slim/slim/update_slim_wmlist (100%)
rename meta-oe/recipes-graphics/{ => nonworking}/slim/slim_1.3.2.bb (100%)
rename meta-oe/recipes-support/{ => nonworking}/fftw/benchfft_3.1.bb (100%)
rename meta-oe/recipes-support/{ => nonworking}/syslog-ng/files/initscript (100%)
rename meta-oe/recipes-support/{ => nonworking}/syslog-ng/files/syslog-ng.conf (100%)
rename meta-oe/recipes-support/{ => nonworking}/syslog-ng/syslog-ng.inc (100%)
rename meta-oe/recipes-support/{ => nonworking}/syslog-ng/syslog-ng_3.2.5.bb (100%)
rename meta-systemd/meta-oe/recipes-devtools/{ => nonworking}/cloud9/cloud9/cloud9.service (100%)
rename meta-systemd/meta-oe/recipes-devtools/{ => nonworking}/cloud9/cloud9_0.6.bbappend (100%)
rename meta-systemd/meta-oe/recipes-support/{ => nonworking}/syslog-ng/syslog-ng_3.2.5.bbappend (100%)
diff --git a/meta-gnome/recipes-gnome/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch b/meta-gnome/recipes-gnome/nonworking/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch
similarity index 100%
rename from meta-gnome/recipes-gnome/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch
rename to meta-gnome/recipes-gnome/nonworking/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch
diff --git a/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.26.3.bb b/meta-gnome/recipes-gnome/nonworking/gnome/gnome-terminal_2.26.3.bb
similarity index 100%
rename from meta-gnome/recipes-gnome/gnome/gnome-terminal_2.26.3.bb
rename to meta-gnome/recipes-gnome/nonworking/gnome/gnome-terminal_2.26.3.bb
diff --git a/meta-gnome/recipes-gnome/system-tools/system-tools-backends-2.10.2/add-angstrom-distro.patch b/meta-gnome/recipes-gnome/nonworking/system-tools/system-tools-backends-2.10.2/add-angstrom-distro.patch
similarity index 100%
rename from meta-gnome/recipes-gnome/system-tools/system-tools-backends-2.10.2/add-angstrom-distro.patch
rename to meta-gnome/recipes-gnome/nonworking/system-tools/system-tools-backends-2.10.2/add-angstrom-distro.patch
diff --git a/meta-gnome/recipes-gnome/system-tools/system-tools-backends-2.10.2/system-tools-backends b/meta-gnome/recipes-gnome/nonworking/system-tools/system-tools-backends-2.10.2/system-tools-backends
similarity index 100%
rename from meta-gnome/recipes-gnome/system-tools/system-tools-backends-2.10.2/system-tools-backends
rename to meta-gnome/recipes-gnome/nonworking/system-tools/system-tools-backends-2.10.2/system-tools-backends
diff --git a/meta-gnome/recipes-gnome/system-tools/system-tools-backends_2.10.2.bb b/meta-gnome/recipes-gnome/nonworking/system-tools/system-tools-backends_2.10.2.bb
similarity index 100%
rename from meta-gnome/recipes-gnome/system-tools/system-tools-backends_2.10.2.bb
rename to meta-gnome/recipes-gnome/nonworking/system-tools/system-tools-backends_2.10.2.bb
diff --git a/meta-oe/recipes-devtools/cloud9/cloud9/0001-ide-use-node-as-interpreter-for-sketches-instead-of-.patch b/meta-oe/recipes-devtools/nonworking/cloud9/cloud9/0001-ide-use-node-as-interpreter-for-sketches-instead-of-.patch
similarity index 100%
rename from meta-oe/recipes-devtools/cloud9/cloud9/0001-ide-use-node-as-interpreter-for-sketches-instead-of-.patch
rename to meta-oe/recipes-devtools/nonworking/cloud9/cloud9/0001-ide-use-node-as-interpreter-for-sketches-instead-of-.patch
diff --git a/meta-oe/recipes-devtools/cloud9/cloud9/cloud9-avahi.service b/meta-oe/recipes-devtools/nonworking/cloud9/cloud9/cloud9-avahi.service
similarity index 100%
rename from meta-oe/recipes-devtools/cloud9/cloud9/cloud9-avahi.service
rename to meta-oe/recipes-devtools/nonworking/cloud9/cloud9/cloud9-avahi.service
diff --git a/meta-oe/recipes-devtools/cloud9/cloud9/index.js b/meta-oe/recipes-devtools/nonworking/cloud9/cloud9/index.js
similarity index 100%
rename from meta-oe/recipes-devtools/cloud9/cloud9/index.js
rename to meta-oe/recipes-devtools/nonworking/cloud9/cloud9/index.js
diff --git a/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb b/meta-oe/recipes-devtools/nonworking/cloud9/cloud9_0.6.bb
similarity index 100%
rename from meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
rename to meta-oe/recipes-devtools/nonworking/cloud9/cloud9_0.6.bb
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/fix-hardfloat-detection.patch b/meta-oe/recipes-devtools/nonworking/nodejs/nodejs/fix-hardfloat-detection.patch
similarity index 100%
rename from meta-oe/recipes-devtools/nodejs/nodejs/fix-hardfloat-detection.patch
rename to meta-oe/recipes-devtools/nonworking/nodejs/nodejs/fix-hardfloat-detection.patch
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_0.6.20.bb b/meta-oe/recipes-devtools/nonworking/nodejs/nodejs_0.6.20.bb
similarity index 100%
rename from meta-oe/recipes-devtools/nodejs/nodejs_0.6.20.bb
rename to meta-oe/recipes-devtools/nonworking/nodejs/nodejs_0.6.20.bb
diff --git a/meta-oe/recipes-graphics/fbida/fbida_2.08.bb b/meta-oe/recipes-graphics/nonworking/fbida/fbida_2.08.bb
similarity index 100%
rename from meta-oe/recipes-graphics/fbida/fbida_2.08.bb
rename to meta-oe/recipes-graphics/nonworking/fbida/fbida_2.08.bb
diff --git a/meta-oe/recipes-graphics/slim/slim/0002-Fix-image-handling-integer-overflows.patch b/meta-oe/recipes-graphics/nonworking/slim/slim/0002-Fix-image-handling-integer-overflows.patch
similarity index 100%
rename from meta-oe/recipes-graphics/slim/slim/0002-Fix-image-handling-integer-overflows.patch
rename to meta-oe/recipes-graphics/nonworking/slim/slim/0002-Fix-image-handling-integer-overflows.patch
diff --git a/meta-oe/recipes-graphics/slim/slim/0003-Fix-build-failure-with-ld-as-needed.patch b/meta-oe/recipes-graphics/nonworking/slim/slim/0003-Fix-build-failure-with-ld-as-needed.patch
similarity index 100%
rename from meta-oe/recipes-graphics/slim/slim/0003-Fix-build-failure-with-ld-as-needed.patch
rename to meta-oe/recipes-graphics/nonworking/slim/slim/0003-Fix-build-failure-with-ld-as-needed.patch
diff --git a/meta-oe/recipes-graphics/slim/slim/0004-Add-support-libpng15.patch b/meta-oe/recipes-graphics/nonworking/slim/slim/0004-Add-support-libpng15.patch
similarity index 100%
rename from meta-oe/recipes-graphics/slim/slim/0004-Add-support-libpng15.patch
rename to meta-oe/recipes-graphics/nonworking/slim/slim/0004-Add-support-libpng15.patch
diff --git a/meta-oe/recipes-graphics/slim/slim/0005-Remove-path-of-gcc-amd-g-and-version-of-g.patch b/meta-oe/recipes-graphics/nonworking/slim/slim/0005-Remove-path-of-gcc-amd-g-and-version-of-g.patch
similarity index 100%
rename from meta-oe/recipes-graphics/slim/slim/0005-Remove-path-of-gcc-amd-g-and-version-of-g.patch
rename to meta-oe/recipes-graphics/nonworking/slim/slim/0005-Remove-path-of-gcc-amd-g-and-version-of-g.patch
diff --git a/meta-oe/recipes-graphics/slim/slim/0006-Remove-localhost-from-Authenticator-of-pam.patch b/meta-oe/recipes-graphics/nonworking/slim/slim/0006-Remove-localhost-from-Authenticator-of-pam.patch
similarity index 100%
rename from meta-oe/recipes-graphics/slim/slim/0006-Remove-localhost-from-Authenticator-of-pam.patch
rename to meta-oe/recipes-graphics/nonworking/slim/slim/0006-Remove-localhost-from-Authenticator-of-pam.patch
diff --git a/meta-oe/recipes-graphics/slim/slim/0007-Fix-tty-slowness.patch b/meta-oe/recipes-graphics/nonworking/slim/slim/0007-Fix-tty-slowness.patch
similarity index 100%
rename from meta-oe/recipes-graphics/slim/slim/0007-Fix-tty-slowness.patch
rename to meta-oe/recipes-graphics/nonworking/slim/slim/0007-Fix-tty-slowness.patch
diff --git a/meta-oe/recipes-graphics/slim/slim/0008-restart-Xserver-if-killed.patch b/meta-oe/recipes-graphics/nonworking/slim/slim/0008-restart-Xserver-if-killed.patch
similarity index 100%
rename from meta-oe/recipes-graphics/slim/slim/0008-restart-Xserver-if-killed.patch
rename to meta-oe/recipes-graphics/nonworking/slim/slim/0008-restart-Xserver-if-killed.patch
diff --git a/meta-oe/recipes-graphics/slim/slim/Makefile.oe b/meta-oe/recipes-graphics/nonworking/slim/slim/Makefile.oe
similarity index 100%
rename from meta-oe/recipes-graphics/slim/slim/Makefile.oe
rename to meta-oe/recipes-graphics/nonworking/slim/slim/Makefile.oe
diff --git a/meta-oe/recipes-graphics/slim/slim/slim-dynwm b/meta-oe/recipes-graphics/nonworking/slim/slim/slim-dynwm
similarity index 100%
rename from meta-oe/recipes-graphics/slim/slim/slim-dynwm
rename to meta-oe/recipes-graphics/nonworking/slim/slim/slim-dynwm
diff --git a/meta-oe/recipes-graphics/slim/slim/slim.pamd b/meta-oe/recipes-graphics/nonworking/slim/slim/slim.pamd
similarity index 100%
rename from meta-oe/recipes-graphics/slim/slim/slim.pamd
rename to meta-oe/recipes-graphics/nonworking/slim/slim/slim.pamd
diff --git a/meta-oe/recipes-graphics/slim/slim/slim.service b/meta-oe/recipes-graphics/nonworking/slim/slim/slim.service
similarity index 100%
rename from meta-oe/recipes-graphics/slim/slim/slim.service
rename to meta-oe/recipes-graphics/nonworking/slim/slim/slim.service
diff --git a/meta-oe/recipes-graphics/slim/slim/update_slim_wmlist b/meta-oe/recipes-graphics/nonworking/slim/slim/update_slim_wmlist
similarity index 100%
rename from meta-oe/recipes-graphics/slim/slim/update_slim_wmlist
rename to meta-oe/recipes-graphics/nonworking/slim/slim/update_slim_wmlist
diff --git a/meta-oe/recipes-graphics/slim/slim_1.3.2.bb b/meta-oe/recipes-graphics/nonworking/slim/slim_1.3.2.bb
similarity index 100%
rename from meta-oe/recipes-graphics/slim/slim_1.3.2.bb
rename to meta-oe/recipes-graphics/nonworking/slim/slim_1.3.2.bb
diff --git a/meta-oe/recipes-support/fftw/benchfft_3.1.bb b/meta-oe/recipes-support/nonworking/fftw/benchfft_3.1.bb
similarity index 100%
rename from meta-oe/recipes-support/fftw/benchfft_3.1.bb
rename to meta-oe/recipes-support/nonworking/fftw/benchfft_3.1.bb
diff --git a/meta-oe/recipes-support/syslog-ng/files/initscript b/meta-oe/recipes-support/nonworking/syslog-ng/files/initscript
similarity index 100%
rename from meta-oe/recipes-support/syslog-ng/files/initscript
rename to meta-oe/recipes-support/nonworking/syslog-ng/files/initscript
diff --git a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf b/meta-oe/recipes-support/nonworking/syslog-ng/files/syslog-ng.conf
similarity index 100%
rename from meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf
rename to meta-oe/recipes-support/nonworking/syslog-ng/files/syslog-ng.conf
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng.inc
similarity index 100%
rename from meta-oe/recipes-support/syslog-ng/syslog-ng.inc
rename to meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng.inc
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.5.bb b/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bb
similarity index 100%
rename from meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.5.bb
rename to meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bb
diff --git a/meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9/cloud9.service b/meta-systemd/meta-oe/recipes-devtools/nonworking/cloud9/cloud9/cloud9.service
similarity index 100%
rename from meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9/cloud9.service
rename to meta-systemd/meta-oe/recipes-devtools/nonworking/cloud9/cloud9/cloud9.service
diff --git a/meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bbappend b/meta-systemd/meta-oe/recipes-devtools/nonworking/cloud9/cloud9_0.6.bbappend
similarity index 100%
rename from meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bbappend
rename to meta-systemd/meta-oe/recipes-devtools/nonworking/cloud9/cloud9_0.6.bbappend
diff --git a/meta-systemd/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.5.bbappend b/meta-systemd/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bbappend
similarity index 100%
rename from meta-systemd/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.5.bbappend
rename to meta-systemd/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bbappend
--
1.8.1.2
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 3/5] move broken recipes to nonworking directories
2013-01-29 12:29 ` [PATCH 3/5] move broken recipes to nonworking directories Martin Jansa
@ 2013-01-29 13:02 ` Koen Kooi
2013-01-29 13:06 ` Martin Jansa
0 siblings, 1 reply; 10+ messages in thread
From: Koen Kooi @ 2013-01-29 13:02 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 29-01-13 13:29, Martin Jansa schreef:
> * this set does not build with distroless qemuarm as reported in 'State
> of bitbake world' thread, nobody volunteered to fix them
Let me have a look at fbida and the cloud9 stuff before moving them.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFRB8h3MkyGM64RGpERApC6AJ9rOSpV/4CVlUD5zgykmd8pcZsdtwCeOmYl
fOvd7+XtTG+kZHl7XI5Vwzc=
=FSkc
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 3/5] move broken recipes to nonworking directories
2013-01-29 13:02 ` Koen Kooi
@ 2013-01-29 13:06 ` Martin Jansa
2013-01-29 15:34 ` Koen Kooi
0 siblings, 1 reply; 10+ messages in thread
From: Martin Jansa @ 2013-01-29 13:06 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 920 bytes --]
On Tue, Jan 29, 2013 at 02:02:47PM +0100, Koen Kooi wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Op 29-01-13 13:29, Martin Jansa schreef:
> > * this set does not build with distroless qemuarm as reported in 'State
> > of bitbake world' thread, nobody volunteered to fix them
>
> Let me have a look at fbida and the cloud9 stuff before moving them.
Sure, thanks!
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.5 (Darwin)
> Comment: GPGTools - http://gpgtools.org
>
> iD8DBQFRB8h3MkyGM64RGpERApC6AJ9rOSpV/4CVlUD5zgykmd8pcZsdtwCeOmYl
> fOvd7+XtTG+kZHl7XI5Vwzc=
> =FSkc
> -----END PGP SIGNATURE-----
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 3/5] move broken recipes to nonworking directories
2013-01-29 13:06 ` Martin Jansa
@ 2013-01-29 15:34 ` Koen Kooi
2013-01-29 15:54 ` Martin Jansa
0 siblings, 1 reply; 10+ messages in thread
From: Koen Kooi @ 2013-01-29 15:34 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 29-01-13 14:06, Martin Jansa schreef:
> On Tue, Jan 29, 2013 at 02:02:47PM +0100, Koen Kooi wrote: Op 29-01-13
> 13:29, Martin Jansa schreef:
>>>> * this set does not build with distroless qemuarm as reported in
>>>> 'State of bitbake world' thread, nobody volunteered to fix them
>
> Let me have a look at fbida and the cloud9 stuff before moving them.
I fixed the fbida build for armv7a/angstrom, but I can't reproduce the
cloud9 error for armv7a/angstrom, can you forward me the error log again please?
regards,
Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFRB+vuMkyGM64RGpERAskYAKCsNst/HA5VRY8cRRCfQ+SUTPJZBgCgrpiz
wn5sJzJUvJjpntPRMVliAMQ=
=NNvn
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 3/5] move broken recipes to nonworking directories
2013-01-29 15:34 ` Koen Kooi
@ 2013-01-29 15:54 ` Martin Jansa
0 siblings, 0 replies; 10+ messages in thread
From: Martin Jansa @ 2013-01-29 15:54 UTC (permalink / raw)
To: openembedded-devel
The error is in nodejs, cloud9 is broken only because of broken dependency.
| Waf: Leaving directory
`/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/nodejs/0.6.20-r0/node-v0.6.20/out'
| Cannot create folder '/usr/include/node/' (original error: [Errno 13]
Permission denied: '/usr/include/node/')
http://logs.nslu2-linux.org/buildlogs/oe/oe-shr-core-branches/log.world.20130129_043850.log/bitbake.log
On Tue, Jan 29, 2013 at 4:34 PM, Koen Kooi <koen@dominion.thruhere.net>wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Op 29-01-13 14:06, Martin Jansa schreef:
> > On Tue, Jan 29, 2013 at 02:02:47PM +0100, Koen Kooi wrote: Op 29-01-13
> > 13:29, Martin Jansa schreef:
> >>>> * this set does not build with distroless qemuarm as reported in
> >>>> 'State of bitbake world' thread, nobody volunteered to fix them
> >
> > Let me have a look at fbida and the cloud9 stuff before moving them.
>
> I fixed the fbida build for armv7a/angstrom, but I can't reproduce the
> cloud9 error for armv7a/angstrom, can you forward me the error log again
> please?
>
> regards,
>
> Koen
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.5 (Darwin)
> Comment: GPGTools - http://gpgtools.org
>
> iD8DBQFRB+vuMkyGM64RGpERAskYAKCsNst/HA5VRY8cRRCfQ+SUTPJZBgCgrpiz
> wn5sJzJUvJjpntPRMVliAMQ=
> =NNvn
> -----END PGP SIGNATURE-----
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 4/5] gnome-panel3: exclude from world
2013-01-29 12:29 [PATCH 0/5] world-image fixes Martin Jansa
` (2 preceding siblings ...)
2013-01-29 12:29 ` [PATCH 3/5] move broken recipes to nonworking directories Martin Jansa
@ 2013-01-29 12:29 ` Martin Jansa
2013-01-29 12:29 ` [PATCH 5/5] vim: use new u-a syntax Martin Jansa
4 siblings, 0 replies; 10+ messages in thread
From: Martin Jansa @ 2013-01-29 12:29 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb
index bd21ca1..3aadd2b 100644
--- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb
@@ -4,6 +4,9 @@ LICENSE = "GPLv2 & LGPLv2 & GFDLv1.1"
BPN = "gnome-panel"
PR = "r1"
+# conflicts with gnome-panel, because they provide the same package
+# http://patches.openembedded.org/patch/43105/
+EXCLUDE_FROM_WORLD = "1"
DEFAULT_PREFERENCE = "-1"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
--
1.8.1.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 5/5] vim: use new u-a syntax
2013-01-29 12:29 [PATCH 0/5] world-image fixes Martin Jansa
` (3 preceding siblings ...)
2013-01-29 12:29 ` [PATCH 4/5] gnome-panel3: exclude from world Martin Jansa
@ 2013-01-29 12:29 ` Martin Jansa
4 siblings, 0 replies; 10+ messages in thread
From: Martin Jansa @ 2013-01-29 12:29 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-support/vim/vim.inc | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta-oe/recipes-support/vim/vim.inc b/meta-oe/recipes-support/vim/vim.inc
index ca36bf1..4fa8f7c 100644
--- a/meta-oe/recipes-support/vim/vim.inc
+++ b/meta-oe/recipes-support/vim/vim.inc
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://README.txt;md5=72c4840d07b65659b60b3fa405c7da36"
PV_MAJOR = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
VIMDIR = "${PN}${@d.getVar('PV',1).split('.')[0]}${@d.getVar('PV',1).split('.')[1]}"
-INC_PR = "r12"
+INC_PR = "r13"
SRC_URI = " \
ftp://ftp.${PN}.org/pub/${PN}/unix/${PN}-${PV_MAJOR}.tar.bz2;name=${VIMDIR} \
@@ -69,9 +69,9 @@ FILES_${PN}-tutor = "${datadir}/${PN}/${VIMDIR}/tutor ${bindir}/${PN}tutor"
FILES_${PN}-vimrc = "${datadir}/${PN}/vimrc"
FILES_${PN}-data = "${datadir}/${PN}"
-ALTERNATIVE_NAME = "vi"
-ALTERNATIVE_PATH = "${bindir}/${PN}"
-ALTERNATIVE_LINK = "${base_bindir}/vi"
-ALTERNATIVE_PRIORITY = "100"
+ALTERNATIVE_${PN} = "vi"
+ALTERNATIVE_TARGET[vi] = "${bindir}/${PN}"
+ALTERNATIVE_LINK_NAME[vi] = "${base_bindir}/vi"
+ALTERNATIVE_PRIORITY[vi] = "100"
PARALLEL_MAKE = ""
--
1.8.1.2
^ permalink raw reply related [flat|nested] 10+ messages in thread