* [PATCH 2/3] cups_1.4.6.bb: Fix build on ppc64
2012-07-22 23:54 [PATCH 1/3] qemu.bbclass: Map the qemu binary name for powerpc64 Khem Raj
@ 2012-07-22 23:54 ` Khem Raj
2012-07-22 23:54 ` [PATCH 3/3] libcgroup_0.37.1.bb: Add recipe Khem Raj
2012-07-26 19:26 ` [PATCH 1/3] qemu.bbclass: Map the qemu binary name for powerpc64 Saul Wold
2 siblings, 0 replies; 5+ messages in thread
From: Khem Raj @ 2012-07-22 23:54 UTC (permalink / raw)
To: openembedded-core
ppc64 uses lib64 and usr/lib64 for library paths
so we need to train cups build system
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../cups/cups-1.4.6/cups_serverbin.patch | 32 ++++++++++++++++++++
meta/recipes-extended/cups/cups14.inc | 26 ++++++++--------
meta/recipes-extended/cups/cups_1.4.6.bb | 7 ++--
3 files changed, 49 insertions(+), 16 deletions(-)
create mode 100644 meta/recipes-extended/cups/cups-1.4.6/cups_serverbin.patch
diff --git a/meta/recipes-extended/cups/cups-1.4.6/cups_serverbin.patch b/meta/recipes-extended/cups/cups-1.4.6/cups_serverbin.patch
new file mode 100644
index 0000000..f7b44a7
--- /dev/null
+++ b/meta/recipes-extended/cups/cups-1.4.6/cups_serverbin.patch
@@ -0,0 +1,32 @@
+Make CUPS_SERVERBIN relative to libdir otherwise on 64bit arches
+e.g. ppc64 where base libdir is lib64 this does not go well
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Inappropriate [OE config specific]
+
+Index: cups-1.4.6/config-scripts/cups-directories.m4
+===================================================================
+--- cups-1.4.6.orig/config-scripts/cups-directories.m4 2009-04-12 16:04:51.000000000 -0700
++++ cups-1.4.6/config-scripts/cups-directories.m4 2012-07-21 12:12:05.896405923 -0700
+@@ -397,7 +397,7 @@
+ *)
+ # All others
+ INSTALL_SYSV="install-sysv"
+- CUPS_SERVERBIN="$exec_prefix/lib/cups"
++ CUPS_SERVERBIN="$libdir/cups"
+ ;;
+ esac
+
+Index: cups-1.4.6/configure
+===================================================================
+--- cups-1.4.6.orig/configure 2012-07-21 12:13:34.512405950 -0700
++++ cups-1.4.6/configure 2012-07-21 12:14:05.724406017 -0700
+@@ -11181,7 +11181,7 @@
+ *)
+ # All others
+ INSTALL_SYSV="install-sysv"
+- CUPS_SERVERBIN="$exec_prefix/lib/cups"
++ CUPS_SERVERBIN="$libdir/cups"
+ ;;
+ esac
+
diff --git a/meta/recipes-extended/cups/cups14.inc b/meta/recipes-extended/cups/cups14.inc
index 4f2b0a1..0517007 100644
--- a/meta/recipes-extended/cups/cups14.inc
+++ b/meta/recipes-extended/cups/cups14.inc
@@ -27,7 +27,7 @@ EXTRA_OECONF = " \
do_configure() {
gnu-configize
libtoolize --force
- DSOFLAGS="${LDFLAGS}" oe_runconf
+ DSOFLAGS="${LDFLAGS}" SERVERBIN="${libdir}/cups" oe_runconf
}
do_compile () {
@@ -66,24 +66,24 @@ python do_package_append() {
PACKAGES =+ "${PN}-lib ${PN}-libimage"
-FILES_${PN} += "${exec_prefix}/lib/cups/backend \
- ${exec_prefix}/lib/cups/cgi-bin \
- ${exec_prefix}/lib/cups/filter \
- ${exec_prefix}/lib/cups/monitor \
- ${exec_prefix}/lib/cups/notifier \
- ${exec_prefix}/lib/cups/daemon \
+FILES_${PN} += "${libdir}/cups/backend \
+ ${libdir}/cups/cgi-bin \
+ ${libdir}/cups/filter \
+ ${libdir}/cups/monitor \
+ ${libdir}/cups/notifier \
+ ${libdir}/cups/daemon \
"
FILES_${PN}-lib = "${libdir}/libcups.so.*"
FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*"
-FILES_${PN}-dbg += "${exec_prefix}/lib/cups/backend/.debug \
- ${exec_prefix}/lib/cups/cgi-bin/.debug \
- ${exec_prefix}/lib/cups/filter/.debug \
- ${exec_prefix}/lib/cups/monitor/.debug \
- ${exec_prefix}/lib/cups/notifier/.debug \
- ${exec_prefix}/lib/cups/daemon/.debug \
+FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \
+ ${libdir}/cups/cgi-bin/.debug \
+ ${libdir}/cups/filter/.debug \
+ ${libdir}/cups/monitor/.debug \
+ ${libdir}/cups/notifier/.debug \
+ ${libdir}/cups/daemon/.debug \
"
#package the html for the webgui inside the main packages (~1MB uncompressed)
diff --git a/meta/recipes-extended/cups/cups_1.4.6.bb b/meta/recipes-extended/cups/cups_1.4.6.bb
index 9825138..8485180 100644
--- a/meta/recipes-extended/cups/cups_1.4.6.bb
+++ b/meta/recipes-extended/cups/cups_1.4.6.bb
@@ -1,13 +1,14 @@
require cups14.inc
-PR = "r4"
+PR = "r5"
DEPENDS += "libusb \
${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=956e7600195e6139f12de8c2a5bbefa9"
SRC_URI += " \
- file://use_echo_only_in_init.patch \
- file://0001-don-t-try-to-run-generated-binaries.patch \
+ file://use_echo_only_in_init.patch \
+ file://0001-don-t-try-to-run-generated-binaries.patch \
+ file://cups_serverbin.patch \
"
SRC_URI[md5sum] = "de8fb5a29c36554925c0c6a6e2c0dae1"
--
1.7.5.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/3] libcgroup_0.37.1.bb: Add recipe
2012-07-22 23:54 [PATCH 1/3] qemu.bbclass: Map the qemu binary name for powerpc64 Khem Raj
2012-07-22 23:54 ` [PATCH 2/3] cups_1.4.6.bb: Fix build on ppc64 Khem Raj
@ 2012-07-22 23:54 ` Khem Raj
2012-07-23 10:00 ` Paul Eggleton
2012-07-26 19:26 ` [PATCH 1/3] qemu.bbclass: Map the qemu binary name for powerpc64 Saul Wold
2 siblings, 1 reply; 5+ messages in thread
From: Khem Raj @ 2012-07-22 23:54 UTC (permalink / raw)
To: openembedded-core
This recipe is imported from meta-oe its a requirement for
systemd to work. Now that systemd is living in a layer of
its own. Lets have this recipe into core metadata
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-core/libcgroup/libcgroup_0.37.1.bb | 27 +++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-core/libcgroup/libcgroup_0.37.1.bb
diff --git a/meta/recipes-core/libcgroup/libcgroup_0.37.1.bb b/meta/recipes-core/libcgroup/libcgroup_0.37.1.bb
new file mode 100644
index 0000000..9aba6e1
--- /dev/null
+++ b/meta/recipes-core/libcgroup/libcgroup_0.37.1.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Libcgroup"
+SECTION = "libs"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
+
+PR = "r1"
+
+inherit autotools pkgconfig
+
+DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/libcg/${PN}/v${PV}/${PN}-${PV}.tar.bz2"
+SRC_URI[md5sum] = "24a41b18de112e8d085bb1f7d9e82af7"
+SRC_URI[sha256sum] = "0b08632de5d3641aa554b422d02a77d9367e57933328a8765204ad9588cd5c0d"
+
+EXTRA_OECONF = "${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam-module-dir=${base_libdir}/security --enable-pam=yes', '--enable-pam=no', d)}"
+
+# http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg21444.html
+PARALLEL_MAKE = ""
+
+PACKAGES =+ "cgroups-pam-plugin"
+FILES_cgroups-pam-plugin = "${base_libdir}/security/pam_cgroup.so*"
+FILES_${PN}-dbg += "${base_libdir}/security/.debug"
+FILES_${PN}-dev += "${base_libdir}/security/*.la"
+
+# We really need the symlink so :(
+ERROR_QA = "debug-deps dev-deps debug-files arch la2 pkgconfig la perms"
--
1.7.5.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 1/3] qemu.bbclass: Map the qemu binary name for powerpc64
2012-07-22 23:54 [PATCH 1/3] qemu.bbclass: Map the qemu binary name for powerpc64 Khem Raj
2012-07-22 23:54 ` [PATCH 2/3] cups_1.4.6.bb: Fix build on ppc64 Khem Raj
2012-07-22 23:54 ` [PATCH 3/3] libcgroup_0.37.1.bb: Add recipe Khem Raj
@ 2012-07-26 19:26 ` Saul Wold
2 siblings, 0 replies; 5+ messages in thread
From: Saul Wold @ 2012-07-26 19:26 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 07/22/2012 04:54 PM, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> meta/classes/qemu.bbclass | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass
> index 68896ce..aead8e2 100644
> --- a/meta/classes/qemu.bbclass
> +++ b/meta/classes/qemu.bbclass
> @@ -9,5 +9,7 @@ def qemu_target_binary(data):
> target_arch = "i386"
> elif target_arch == "powerpc":
> target_arch = "ppc"
> + elif target_arch == "powerpc64":
> + target_arch = "ppc64"
>
> return "qemu-" + target_arch
>
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply [flat|nested] 5+ messages in thread