From 7e35ee58bba13381869e2e67d107b7d0c0e9d584 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 11 Nov 2009 08:42:35 +0100 Subject: cups: fix do_package, do_stage is still broken --- recipes/cups/cups.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'recipes/cups/cups.inc') diff --git a/recipes/cups/cups.inc b/recipes/cups/cups.inc index 006e6a3250..642595d48f 100644 --- a/recipes/cups/cups.inc +++ b/recipes/cups/cups.inc @@ -61,8 +61,8 @@ do_stage () { python do_package_append() { # Change permissions back the way they were, they probably had a reason... - workdir = bb.data.getVar('WORKDIR', d, 1) - os.system('chmod 0511 %s/install/cups/var/run/cups/certs' % workdir) + pkgdest = bb.data.getVar('PKGDEST', d, 1) + os.system('chmod 0511 %s/cups/var/run/cups/certs' % pkgdest) } do_stage_append() { -- cgit v1.2.3 From caec0ee3d05082277c1af4863b6d653109f5714e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 11 Nov 2009 08:58:25 +0100 Subject: cups: switch to new style binconfig (un)Mangling --- recipes/cups/cups.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'recipes/cups/cups.inc') diff --git a/recipes/cups/cups.inc b/recipes/cups/cups.inc index 642595d48f..db4475cd5c 100644 --- a/recipes/cups/cups.inc +++ b/recipes/cups/cups.inc @@ -65,11 +65,13 @@ python do_package_append() { os.system('chmod 0511 %s/cups/var/run/cups/certs' % pkgdest) } -do_stage_append() { +SYSROOT_PREPROCESS_FUNCS += "cups_config_mangle" + +cups_config_mangle() { # Undo mangle of cups_datadir and cups_serverbin sed -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:g' \ -e 's:cups_serverbin=.*:cups_serverbin=${libdir}/cups:g' \ - -i ${STAGING_BINDIR_CROSS}/cups-config + -i ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/cups-config } PACKAGES =+ "${PN}-lib ${PN}-libimage" -- cgit v1.2.3