From 0216e5306a53fe233363412727d937cbce13ed9d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 7 Oct 2015 00:15:21 +0200 Subject: [PATCH] Revert "gnome-terminal, system-tools-backends, slim, benchfft, syslog-ng: move to nonworking directories" * use PNBLACKLIST instead This reverts commit 92ea562bafda6b201fae91c2bc13a404da4d581c. Signed-off-by: Martin Jansa --- .../system-tools-backends-2.10.2/add-angstrom-distro.patch | 0 .../system-tools-backends-2.10.2/system-tools-backends | 0 .../system-tools/system-tools-backends_2.10.2.bb | 2 ++ .../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/0005-Remove-path-of-gcc-amd-g-and-version-of-g.patch | 0 .../slim/0006-Remove-localhost-from-Authenticator-of-pam.patch | 0 .../{nonworking => }/slim/slim/0007-Fix-tty-slowness.patch | 0 .../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 .../recipes-graphics/{nonworking => }/slim/slim/slim.service | 0 .../{nonworking => }/slim/slim/update_slim_wmlist | 0 meta-oe/recipes-graphics/{nonworking => }/slim/slim_1.3.2.bb | 1 + meta-oe/recipes-support/{nonworking => }/fftw/benchfft_3.1.bb | 2 ++ 17 files changed, 5 insertions(+) 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 (91%) 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 (94%) rename meta-oe/recipes-support/{nonworking => }/fftw/benchfft_3.1.bb (78%) diff --git a/meta-gnome/recipes-gnome/nonworking/system-tools/system-tools-backends-2.10.2/add-angstrom-distro.patch b/meta-gnome/recipes-gnome/system-tools/system-tools-backends-2.10.2/add-angstrom-distro.patch similarity index 100% rename from meta-gnome/recipes-gnome/nonworking/system-tools/system-tools-backends-2.10.2/add-angstrom-distro.patch rename to meta-gnome/recipes-gnome/system-tools/system-tools-backends-2.10.2/add-angstrom-distro.patch diff --git a/meta-gnome/recipes-gnome/nonworking/system-tools/system-tools-backends-2.10.2/system-tools-backends b/meta-gnome/recipes-gnome/system-tools/system-tools-backends-2.10.2/system-tools-backends similarity index 100% rename from meta-gnome/recipes-gnome/nonworking/system-tools/system-tools-backends-2.10.2/system-tools-backends rename to meta-gnome/recipes-gnome/system-tools/system-tools-backends-2.10.2/system-tools-backends diff --git a/meta-gnome/recipes-gnome/nonworking/system-tools/system-tools-backends_2.10.2.bb b/meta-gnome/recipes-gnome/system-tools/system-tools-backends_2.10.2.bb similarity index 91% rename from meta-gnome/recipes-gnome/nonworking/system-tools/system-tools-backends_2.10.2.bb rename to meta-gnome/recipes-gnome/system-tools/system-tools-backends_2.10.2.bb index 584d796c0b..1693f37cb4 100644 --- a/meta-gnome/recipes-gnome/nonworking/system-tools/system-tools-backends_2.10.2.bb +++ b/meta-gnome/recipes-gnome/system-tools/system-tools-backends_2.10.2.bb @@ -50,3 +50,5 @@ FILES_${PN} += " ${datadir}/dbus-1/system-services" FILES_${PN} += " ${datadir}/system-tools-backends-2.0/files" FILES_${PN} += " ${datadir}/system-tools-backends-2.0/scripts" FILES_${PN} += " ${datadir}/polkit*" + +PNBLACKLIST[system-tools-backends] ?= "does not build with distroless qemuarm as reported in 'State of bitbake world' thread, nobody volunteered to fix them" diff --git a/meta-oe/recipes-graphics/nonworking/slim/slim/0002-Fix-image-handling-integer-overflows.patch b/meta-oe/recipes-graphics/slim/slim/0002-Fix-image-handling-integer-overflows.patch similarity index 100% rename from meta-oe/recipes-graphics/nonworking/slim/slim/0002-Fix-image-handling-integer-overflows.patch rename to meta-oe/recipes-graphics/slim/slim/0002-Fix-image-handling-integer-overflows.patch diff --git a/meta-oe/recipes-graphics/nonworking/slim/slim/0003-Fix-build-failure-with-ld-as-needed.patch b/meta-oe/recipes-graphics/slim/slim/0003-Fix-build-failure-with-ld-as-needed.patch similarity index 100% rename from meta-oe/recipes-graphics/nonworking/slim/slim/0003-Fix-build-failure-with-ld-as-needed.patch rename to meta-oe/recipes-graphics/slim/slim/0003-Fix-build-failure-with-ld-as-needed.patch diff --git a/meta-oe/recipes-graphics/nonworking/slim/slim/0004-Add-support-libpng15.patch b/meta-oe/recipes-graphics/slim/slim/0004-Add-support-libpng15.patch similarity index 100% rename from meta-oe/recipes-graphics/nonworking/slim/slim/0004-Add-support-libpng15.patch rename to meta-oe/recipes-graphics/slim/slim/0004-Add-support-libpng15.patch diff --git a/meta-oe/recipes-graphics/nonworking/slim/slim/0005-Remove-path-of-gcc-amd-g-and-version-of-g.patch b/meta-oe/recipes-graphics/slim/slim/0005-Remove-path-of-gcc-amd-g-and-version-of-g.patch similarity index 100% rename from meta-oe/recipes-graphics/nonworking/slim/slim/0005-Remove-path-of-gcc-amd-g-and-version-of-g.patch rename to meta-oe/recipes-graphics/slim/slim/0005-Remove-path-of-gcc-amd-g-and-version-of-g.patch diff --git a/meta-oe/recipes-graphics/nonworking/slim/slim/0006-Remove-localhost-from-Authenticator-of-pam.patch b/meta-oe/recipes-graphics/slim/slim/0006-Remove-localhost-from-Authenticator-of-pam.patch similarity index 100% rename from meta-oe/recipes-graphics/nonworking/slim/slim/0006-Remove-localhost-from-Authenticator-of-pam.patch rename to meta-oe/recipes-graphics/slim/slim/0006-Remove-localhost-from-Authenticator-of-pam.patch diff --git a/meta-oe/recipes-graphics/nonworking/slim/slim/0007-Fix-tty-slowness.patch b/meta-oe/recipes-graphics/slim/slim/0007-Fix-tty-slowness.patch similarity index 100% rename from meta-oe/recipes-graphics/nonworking/slim/slim/0007-Fix-tty-slowness.patch rename to meta-oe/recipes-graphics/slim/slim/0007-Fix-tty-slowness.patch diff --git a/meta-oe/recipes-graphics/nonworking/slim/slim/0008-restart-Xserver-if-killed.patch b/meta-oe/recipes-graphics/slim/slim/0008-restart-Xserver-if-killed.patch similarity index 100% rename from meta-oe/recipes-graphics/nonworking/slim/slim/0008-restart-Xserver-if-killed.patch rename to meta-oe/recipes-graphics/slim/slim/0008-restart-Xserver-if-killed.patch diff --git a/meta-oe/recipes-graphics/nonworking/slim/slim/Makefile.oe b/meta-oe/recipes-graphics/slim/slim/Makefile.oe similarity index 100% rename from meta-oe/recipes-graphics/nonworking/slim/slim/Makefile.oe rename to meta-oe/recipes-graphics/slim/slim/Makefile.oe diff --git a/meta-oe/recipes-graphics/nonworking/slim/slim/slim-dynwm b/meta-oe/recipes-graphics/slim/slim/slim-dynwm similarity index 100% rename from meta-oe/recipes-graphics/nonworking/slim/slim/slim-dynwm rename to meta-oe/recipes-graphics/slim/slim/slim-dynwm diff --git a/meta-oe/recipes-graphics/nonworking/slim/slim/slim.pamd b/meta-oe/recipes-graphics/slim/slim/slim.pamd similarity index 100% rename from meta-oe/recipes-graphics/nonworking/slim/slim/slim.pamd rename to meta-oe/recipes-graphics/slim/slim/slim.pamd diff --git a/meta-oe/recipes-graphics/nonworking/slim/slim/slim.service b/meta-oe/recipes-graphics/slim/slim/slim.service similarity index 100% rename from meta-oe/recipes-graphics/nonworking/slim/slim/slim.service rename to meta-oe/recipes-graphics/slim/slim/slim.service diff --git a/meta-oe/recipes-graphics/nonworking/slim/slim/update_slim_wmlist b/meta-oe/recipes-graphics/slim/slim/update_slim_wmlist similarity index 100% rename from meta-oe/recipes-graphics/nonworking/slim/slim/update_slim_wmlist rename to meta-oe/recipes-graphics/slim/slim/update_slim_wmlist diff --git a/meta-oe/recipes-graphics/nonworking/slim/slim_1.3.2.bb b/meta-oe/recipes-graphics/slim/slim_1.3.2.bb similarity index 94% rename from meta-oe/recipes-graphics/nonworking/slim/slim_1.3.2.bb rename to meta-oe/recipes-graphics/slim/slim_1.3.2.bb index 5519b0e7d7..1ae8dbbc6c 100644 --- a/meta-oe/recipes-graphics/nonworking/slim/slim_1.3.2.bb +++ b/meta-oe/recipes-graphics/slim/slim_1.3.2.bb @@ -79,3 +79,4 @@ systemctl disable slim.service sed -i /slim/d $D${sysconfdir}/X11/default-display-manager || true } +PNBLACKLIST[slim] ?= "does not build with distroless qemuarm as reported in 'State of bitbake world' thread, nobody volunteered to fix them" diff --git a/meta-oe/recipes-support/nonworking/fftw/benchfft_3.1.bb b/meta-oe/recipes-support/fftw/benchfft_3.1.bb similarity index 78% rename from meta-oe/recipes-support/nonworking/fftw/benchfft_3.1.bb rename to meta-oe/recipes-support/fftw/benchfft_3.1.bb index feb3c3c25d..d859386be8 100644 --- a/meta-oe/recipes-support/nonworking/fftw/benchfft_3.1.bb +++ b/meta-oe/recipes-support/fftw/benchfft_3.1.bb @@ -17,3 +17,5 @@ do_compile_prepend() { SRC_URI[md5sum] = "9356e5e9dcb3f1481977009720a2ccf8" SRC_URI[sha256sum] = "1b4a5b5e48ad5e61a21586b7b59d5c0a88691a981e73e2c6dc5868197461791b" + +PNBLACKLIST[benchfft] ?= "does not build with distroless qemuarm as reported in 'State of bitbake world' thread, nobody volunteered to fix them"