diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-05-21 15:02:42 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-05-21 15:02:42 +0200 |
| commit | ccab93e06e6b3fc9a58a000fce97270d99911780 (patch) | |
| tree | 545cf8b2e2d6a23df9f47aa4128d5baef75b61a0 /recipes/cups | |
| parent | d543c80be652f118cbbfa94250bd2aca9bb9aea4 (diff) | |
| parent | eca20211da63073e3a35dd1f647ef534662c4771 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/cups')
| -rw-r--r-- | recipes/cups/cups.inc | 10 | ||||
| -rw-r--r-- | recipes/cups/cups_1.1.23.bb | 2 | ||||
| -rw-r--r-- | recipes/cups/cups_1.2.12.bb | 2 | ||||
| -rw-r--r-- | recipes/cups/cups_1.2.7.bb | 2 | ||||
| -rw-r--r-- | recipes/cups/cups_1.3.8.bb | 2 |
5 files changed, 13 insertions, 5 deletions
diff --git a/recipes/cups/cups.inc b/recipes/cups/cups.inc index 8e2a7a8075..cbec781881 100644 --- a/recipes/cups/cups.inc +++ b/recipes/cups/cups.inc @@ -3,6 +3,8 @@ SECTION = "console/utils" LICENSE = "GPL LGPL" DEPENDS = "gnutls jpeg dbus dbus-glib libpng zlib fakeroot-native" +INC_PR = "r7" + SRC_URI = "ftp://ftp.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \ " @@ -62,6 +64,13 @@ python do_package_append() { os.system('chmod 0511 %s/install/cups/var/run/cups/certs' % workdir) } +do_stage_append() { + # 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 +} + PACKAGES =+ "${PN}-lib ${PN}-libimage" FILES_${PN}-lib = "${libdir}/libcups.so.*" @@ -82,4 +91,3 @@ FILES_${PN} += "${datadir}/doc/cups/images \ ${datadir}/doc/cups/*.css \ ${datadir}/icons/ \ " - diff --git a/recipes/cups/cups_1.1.23.bb b/recipes/cups/cups_1.1.23.bb index d6f0de8d7b..bc1053cd9e 100644 --- a/recipes/cups/cups_1.1.23.bb +++ b/recipes/cups/cups_1.1.23.bb @@ -2,7 +2,7 @@ DESCRIPTION = "An Internet printing system for Unix." SECTION = "console/utils" LICENSE = "GPL LGPL" DEPENDS = "openssl jpeg libpng zlib fakeroot-native" -PR = "r6" +PR = "${INC_PR}.1" SRC_URI = "ftp://ftp3.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \ file://strftime_fix.patch;patch=1" diff --git a/recipes/cups/cups_1.2.12.bb b/recipes/cups/cups_1.2.12.bb index 4f7d0d49b6..773f97e101 100644 --- a/recipes/cups/cups_1.2.12.bb +++ b/recipes/cups/cups_1.2.12.bb @@ -1,2 +1,2 @@ require cups.inc -PR = "r2" +PR = "${INC_PR}.1" diff --git a/recipes/cups/cups_1.2.7.bb b/recipes/cups/cups_1.2.7.bb index 8559bfcf8e..7084032662 100644 --- a/recipes/cups/cups_1.2.7.bb +++ b/recipes/cups/cups_1.2.7.bb @@ -2,7 +2,7 @@ DESCRIPTION = "An Internet printing system for Unix." SECTION = "console/utils" LICENSE = "GPL LGPL" DEPENDS = "gnutls jpeg dbus dbus-glib libpng zlib fakeroot-native" -PR = "r1" +PR = "${INC_PR}.1" SRC_URI = "ftp://ftp3.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \ " diff --git a/recipes/cups/cups_1.3.8.bb b/recipes/cups/cups_1.3.8.bb index 79cbc32715..c921133c5d 100644 --- a/recipes/cups/cups_1.3.8.bb +++ b/recipes/cups/cups_1.3.8.bb @@ -1,7 +1,7 @@ require cups.inc SRC_URI += "file://use_echo_only_in_init.patch;patch=1" -PR = "r2" +PR = "${INC_PR}.1" DEFAULT_PREFERENCE = "-1" |