From 308d584de51bc55246df4a127c6a74cdc9a66750 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 7 May 2009 00:04:17 -0300 Subject: cups: undo mangle of cups_{datadir,serverbin} in cups-config Signed-off-by: Otavio Salvador --- recipes/cups/cups.inc | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'recipes/cups') diff --git a/recipes/cups/cups.inc b/recipes/cups/cups.inc index 8e2a7a8075..56450f78fe 100644 --- a/recipes/cups/cups.inc +++ b/recipes/cups/cups.inc @@ -62,6 +62,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.*" -- cgit v1.2.3 From 36d5b6464b18caf961faf61b2f8a4732e40a15f9 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 20 May 2009 23:30:56 -0300 Subject: cups: use INC_PR due cups.inc being used in many recipes To be easier to update the recipes we use a INC_PR in cups.inc that is included in all PR fields in all recipes. Since currently the oldest revision was 'r6' INC_PR starts in 'r7'. Signed-off-by: Otavio Salvador --- recipes/cups/cups.inc | 3 ++- recipes/cups/cups_1.1.23.bb | 2 +- recipes/cups/cups_1.2.12.bb | 2 +- recipes/cups/cups_1.2.7.bb | 2 +- recipes/cups/cups_1.3.8.bb | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) (limited to 'recipes/cups') diff --git a/recipes/cups/cups.inc b/recipes/cups/cups.inc index 56450f78fe..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 \ " @@ -89,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" -- cgit v1.2.3