diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-11-12 03:08:38 +0300 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-11-12 03:08:38 +0300 |
| commit | de8ffe4113d99413430db87830837042920a3ed9 (patch) | |
| tree | 75436606c5fea6876dc0464965db02448b27e70d /recipes/cups/cups.inc | |
| parent | bf132a8996db2e75ce4d9e754ea50fa487c52160 (diff) | |
| parent | 98c4cef80ccac7e109e8479ac3902b6ef24ff16f (diff) | |
Merge commit 'origin/org.openembedded.dev' into org.openembedded.dev
Diffstat (limited to 'recipes/cups/cups.inc')
| -rw-r--r-- | recipes/cups/cups.inc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/recipes/cups/cups.inc b/recipes/cups/cups.inc index 006e6a3250..db4475cd5c 100644 --- a/recipes/cups/cups.inc +++ b/recipes/cups/cups.inc @@ -61,15 +61,17 @@ 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() { +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" |