* [PATCH 0/6] Fix core-image-lsb dependencies
@ 2011-09-22 1:46 Mark Hatle
2011-09-22 1:47 ` [PATCH 1/6] python: Fix cgi.py runtime issue Mark Hatle
` (6 more replies)
0 siblings, 7 replies; 10+ messages in thread
From: Mark Hatle @ 2011-09-22 1:46 UTC (permalink / raw)
To: openembedded-core
Fix additional dependencies found while building core-image-lsb. Most of
the issues are related to simple errors in the recipes or PAM integration
problems.
The following changes since commit 40b52d9ed9b7b39bc86b3c87ae60fa6359cac265:
distro tracking: Update Distro Aliases (2011-09-22 01:30:00 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib mhatle/rpm
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/rpm
Mark Hatle (6):
python: Fix cgi.py runtime issue
usbutils: Move the pkgconfig file(s) to the -dev package
foomatic-filters: Disable filter checking
perl: Fix a few perl binaries to use target interpreter paths
sudo: Fix PAM dependencies
task-core-lsb: Remove perl-dev
meta/recipes-bsp/usbutils/usbutils_0.91.bb | 4 +-
meta/recipes-devtools/perl/perl_5.12.3.bb | 10 ++++++++-
meta/recipes-devtools/python/python/cgi_py.patch | 21 ++++++++++++++++++++
meta/recipes-devtools/python/python_2.6.6.bb | 3 +-
.../foomatic/foomatic-filters_4.0.7.bb | 21 ++++++++++++++-----
meta/recipes-extended/sudo/sudo_1.8.1p2.bb | 5 +++-
meta/recipes-extended/tasks/task-core-lsb.bb | 3 +-
7 files changed, 54 insertions(+), 13 deletions(-)
create mode 100644 meta/recipes-devtools/python/python/cgi_py.patch
--
1.7.3.4
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 1/6] python: Fix cgi.py runtime issue
2011-09-22 1:46 [PATCH 0/6] Fix core-image-lsb dependencies Mark Hatle
@ 2011-09-22 1:47 ` Mark Hatle
2011-09-22 1:47 ` [PATCH 2/6] usbutils: Move the pkgconfig file(s) to the -dev package Mark Hatle
` (5 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Mark Hatle @ 2011-09-22 1:47 UTC (permalink / raw)
To: openembedded-core
By default cgi.py attempts to use /usr/local/bin/python as its
interpreter. However, on my Linux systems, including OE-Core,
python is installed into {bindir}. Adjust this one file based on
the comment at the top of the upstream file.
This resolves an issue where a runtime dependency discovered during
RPM packaging breaks the rootfs construction.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-devtools/python/python/cgi_py.patch | 21 +++++++++++++++++++++
meta/recipes-devtools/python/python_2.6.6.bb | 3 ++-
2 files changed, 23 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-devtools/python/python/cgi_py.patch
diff --git a/meta/recipes-devtools/python/python/cgi_py.patch b/meta/recipes-devtools/python/python/cgi_py.patch
new file mode 100644
index 0000000..0f10efc
--- /dev/null
+++ b/meta/recipes-devtools/python/python/cgi_py.patch
@@ -0,0 +1,21 @@
+Lib/cgi.py: Update the script as mentioned in the comment
+
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+
+--- Python-2.6.6/Lib/cgi.py.orig 2010-08-01 22:14:27.000000000 -0500
++++ Python-2.6.6/Lib/cgi.py 2011-09-21 15:28:40.478208631 -0500
+@@ -1,13 +1,4 @@
+-#! /usr/local/bin/python
+-
+-# NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is
+-# intentionally NOT "/usr/bin/env python". On many systems
+-# (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI
+-# scripts, and /usr/local/bin is the default directory where Python is
+-# installed, so /usr/bin/env would be unable to find python. Granted,
+-# binary installations by Linux vendors often install Python in
+-# /usr/bin. So let those vendors patch cgi.py to match their choice
+-# of installation.
++#! /usr/bin/env python
+
+ """Support module for CGI (Common Gateway Interface) scripts.
+
diff --git a/meta/recipes-devtools/python/python_2.6.6.bb b/meta/recipes-devtools/python/python_2.6.6.bb
index c9c1a13..aa7ec3c 100644
--- a/meta/recipes-devtools/python/python_2.6.6.bb
+++ b/meta/recipes-devtools/python/python_2.6.6.bb
@@ -1,7 +1,7 @@
require python.inc
DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib"
DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
-PR = "${INC_PR}.9"
+PR = "${INC_PR}.10"
LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6"
DISTRO_SRC_URI ?= "file://sitecustomize.py"
@@ -20,6 +20,7 @@ SRC_URI = "\
${DISTRO_SRC_URI} \
file://multilib.patch \
file://security_issue_2254_fix.patch \
+ file://cgi_py.patch \
"
SRC_URI[md5sum] = "cf4e6881bb84a7ce6089e4a307f71f14"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/6] usbutils: Move the pkgconfig file(s) to the -dev package
2011-09-22 1:46 [PATCH 0/6] Fix core-image-lsb dependencies Mark Hatle
2011-09-22 1:47 ` [PATCH 1/6] python: Fix cgi.py runtime issue Mark Hatle
@ 2011-09-22 1:47 ` Mark Hatle
2011-09-22 1:47 ` [PATCH 3/6] foomatic-filters: Disable filter checking Mark Hatle
` (4 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Mark Hatle @ 2011-09-22 1:47 UTC (permalink / raw)
To: openembedded-core
pkgconfig files belong in the -dev package. They automatically add
a runtime dependency (when packaging with RPM) for "pkgconfig", which
is not desired to be installed with this package.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-bsp/usbutils/usbutils_0.91.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-bsp/usbutils/usbutils_0.91.bb b/meta/recipes-bsp/usbutils/usbutils_0.91.bb
index c5420d0..490b05a 100644
--- a/meta/recipes-bsp/usbutils/usbutils_0.91.bb
+++ b/meta/recipes-bsp/usbutils/usbutils_0.91.bb
@@ -7,7 +7,7 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "libusb zlib"
-PR = "r2"
+PR = "r3"
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz"
@@ -23,7 +23,7 @@ do_install_append() {
}
PACKAGES += "${PN}-ids"
-FILES_${PN} += "${datadir}/pkgconfig"
+FILES_${PN}-dev += "${datadir}/pkgconfig"
FILES_${PN}-ids = "${datadir}/usb*"
RDEPENDS_${PN} = "${PN}-ids bash"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/6] foomatic-filters: Disable filter checking
2011-09-22 1:46 [PATCH 0/6] Fix core-image-lsb dependencies Mark Hatle
2011-09-22 1:47 ` [PATCH 1/6] python: Fix cgi.py runtime issue Mark Hatle
2011-09-22 1:47 ` [PATCH 2/6] usbutils: Move the pkgconfig file(s) to the -dev package Mark Hatle
@ 2011-09-22 1:47 ` Mark Hatle
2011-09-22 4:16 ` Richard Purdie
2011-09-22 1:47 ` [PATCH 4/6] perl: Fix a few perl binaries to use target interpreter paths Mark Hatle
` (3 subsequent siblings)
6 siblings, 1 reply; 10+ messages in thread
From: Mark Hatle @ 2011-09-22 1:47 UTC (permalink / raw)
To: openembedded-core
Disable a few checks, and hard code the values for a few other items
to work around potential host contamination issues. We also default
to the cups configuration for items.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
.../foomatic/foomatic-filters_4.0.7.bb | 21 ++++++++++++++-----
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-extended/foomatic/foomatic-filters_4.0.7.bb b/meta/recipes-extended/foomatic/foomatic-filters_4.0.7.bb
index 9627187..856f5ac 100644
--- a/meta/recipes-extended/foomatic/foomatic-filters_4.0.7.bb
+++ b/meta/recipes-extended/foomatic/foomatic-filters_4.0.7.bb
@@ -10,7 +10,7 @@ format using a printer-specific, but spooler-independent PPD file. \
"
DEPENDS += "cups perl libxml2"
-PR = "r1"
+PR = "r2"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://${WORKDIR}/foomatic-filters-${PV}/COPYING;md5=393a5ca445f6965873eca0259a17f833"
@@ -20,11 +20,20 @@ SRC_URI = "http://www.openprinting.org/download/foomatic/foomatic-filters-${PV}.
SRC_URI[md5sum] = "20abd25c1c98b2dae68709062a132a7d"
SRC_URI[sha256sum] = "090313fae40b177f505d9c9b93d7a4d7188b6d5d18b6ae41ab24903ac983478d"
-do_install_append_linuxstdbase() {
- install -d ${D}${libdir}/cups/filter
- ln -sf ${bindir}/foomatic-rip ${D}${libdir}/cups/filter
+inherit autotools
+
+EXTRA_OECONF += "--disable-file-converter-check --with-file-converter=texttops"
+
+do_configure_prepend() {
+ export LIB_CUPS=/usr/lib/cups # /usr/lib NOT libdir
+ export CUPS_BACKENDS=/usr/lib/cups/backend # /usr/lib NOT libdir
+ export CUPS_FILTERS=/usr/lib/cups/filter # /usr/lib NOT libdir
+ export CUPS_PPDS=%{_datadir}/cups/model
}
-FILES_${PN}_append_linuxstdbase += "${libdir}/cups/filter/foomatic-rip"
+do_install_append_linuxstdbase() {
+ install -d ${D}/usr/lib/cups/filter
+ ln -sf ${bindir}/foomatic-rip ${D}/usr/lib/cups/filter
+}
-inherit autotools
+FILES_${PN}_append_linuxstdbase += "/usr/lib/cups/filter/foomatic-rip"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 4/6] perl: Fix a few perl binaries to use target interpreter paths
2011-09-22 1:46 [PATCH 0/6] Fix core-image-lsb dependencies Mark Hatle
` (2 preceding siblings ...)
2011-09-22 1:47 ` [PATCH 3/6] foomatic-filters: Disable filter checking Mark Hatle
@ 2011-09-22 1:47 ` Mark Hatle
2011-09-22 1:47 ` [PATCH 5/6] sudo: Fix PAM dependencies Mark Hatle
` (2 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Mark Hatle @ 2011-09-22 1:47 UTC (permalink / raw)
To: openembedded-core
A small number of target installed programs, "${bindir}/pod*",
were incorrectly using the perl-native paths to access perl. This
caused a dependency failure during RPM rootfs install, and also
prevented those specific components from functioning.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-devtools/perl/perl_5.12.3.bb | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/perl/perl_5.12.3.bb b/meta/recipes-devtools/perl/perl_5.12.3.bb
index d286564..e4769a4 100644
--- a/meta/recipes-devtools/perl/perl_5.12.3.bb
+++ b/meta/recipes-devtools/perl/perl_5.12.3.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
# We need gnugrep (for -I)
DEPENDS = "virtual/db grep-native"
DEPENDS += "gdbm zlib"
-PR = "r4"
+PR = "r5"
# 5.10.1 has Module::Build built-in
PROVIDES += "libmodule-build-perl"
@@ -216,9 +216,17 @@ perl_package_preprocess () {
-e "s,${STAGING_LIBDIR},${libdir},g" \
-e "s,${STAGING_BINDIR},${bindir},g" \
-e "s,${STAGING_INCDIR},${includedir},g" \
+ -e "s,${STAGING_BINDIR_NATIVE}/perl-native/,${bindir}/,g" \
-e "s,${STAGING_BINDIR_NATIVE}/,,g" \
${PKGD}${bindir}/h2xs \
${PKGD}${bindir}/h2ph \
+ ${PKGD}${bindir}/pod2html \
+ ${PKGD}${bindir}/pod2latex \
+ ${PKGD}${bindir}/pod2man \
+ ${PKGD}${bindir}/pod2text \
+ ${PKGD}${bindir}/pod2usage \
+ ${PKGD}${bindir}/podchecker \
+ ${PKGD}${bindir}/podselect \
${PKGD}${libdir}/perl/${PV}/pod/*.pod \
${PKGD}${libdir}/perl/${PV}/cacheout.pl \
${PKGD}${libdir}/perl/${PV}/FileCache.pm \
--
1.7.3.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 5/6] sudo: Fix PAM dependencies
2011-09-22 1:46 [PATCH 0/6] Fix core-image-lsb dependencies Mark Hatle
` (3 preceding siblings ...)
2011-09-22 1:47 ` [PATCH 4/6] perl: Fix a few perl binaries to use target interpreter paths Mark Hatle
@ 2011-09-22 1:47 ` Mark Hatle
2011-09-22 1:47 ` [PATCH 6/6] task-core-lsb: Remove perl-dev Mark Hatle
2011-09-22 4:17 ` [PATCH 0/6] Fix core-image-lsb dependencies Richard Purdie
6 siblings, 0 replies; 10+ messages in thread
From: Mark Hatle @ 2011-09-22 1:47 UTC (permalink / raw)
To: openembedded-core
When PAM is enabled for the distribution we need to be sure to have a
build dependency of libpam, and runtime dependencies on the pam modules
used by the sudo package.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-extended/sudo/sudo_1.8.1p2.bb | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-extended/sudo/sudo_1.8.1p2.bb b/meta/recipes-extended/sudo/sudo_1.8.1p2.bb
index 9cf9ecc..b568291 100644
--- a/meta/recipes-extended/sudo/sudo_1.8.1p2.bb
+++ b/meta/recipes-extended/sudo/sudo_1.8.1p2.bb
@@ -1,6 +1,6 @@
require sudo.inc
-PR = "r1"
+PR = "r2"
SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
file://libtool.patch \
@@ -11,6 +11,9 @@ PAM_SRC_URI = "file://sudo.pam"
SRC_URI[md5sum] = "e8330f0e63b0ecb2e12b5c76922818cc"
SRC_URI[sha256sum] = "281f90c80547cf22132e351e7f61c25ba4ba9cf393438468f318f9a7884026fb"
+DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
+RDEPENDS_${PN} += " ${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}"
+
EXTRA_OECONF += " ${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)}"
do_install_append () {
--
1.7.3.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 6/6] task-core-lsb: Remove perl-dev
2011-09-22 1:46 [PATCH 0/6] Fix core-image-lsb dependencies Mark Hatle
` (4 preceding siblings ...)
2011-09-22 1:47 ` [PATCH 5/6] sudo: Fix PAM dependencies Mark Hatle
@ 2011-09-22 1:47 ` Mark Hatle
2011-09-22 4:17 ` [PATCH 0/6] Fix core-image-lsb dependencies Richard Purdie
6 siblings, 0 replies; 10+ messages in thread
From: Mark Hatle @ 2011-09-22 1:47 UTC (permalink / raw)
To: openembedded-core
Remove the perl-dev recipe from the required packages. When this
recipe is included, libc6-dev is automatically added as are a large
number of other -dev packages. Eventually this creates a system
where the dependencies may not be able to be satisfied.
The perl-dev package should not be required in order to pass the LSB
testing.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-extended/tasks/task-core-lsb.bb | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-extended/tasks/task-core-lsb.bb b/meta/recipes-extended/tasks/task-core-lsb.bb
index 672b487..c48ccf0 100644
--- a/meta/recipes-extended/tasks/task-core-lsb.bb
+++ b/meta/recipes-extended/tasks/task-core-lsb.bb
@@ -3,7 +3,7 @@
#
DESCRIPTION = "Create Small Image Tasks"
-PR = "r5"
+PR = "r6"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
@@ -140,7 +140,6 @@ RDEPENDS_task-core-lsb-command-add = "\
RDEPENDS_task-core-lsb-perl-add = "\
perl-modules \
- perl-dev \
perl-misc \
perl-pod \
"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 3/6] foomatic-filters: Disable filter checking
2011-09-22 1:47 ` [PATCH 3/6] foomatic-filters: Disable filter checking Mark Hatle
@ 2011-09-22 4:16 ` Richard Purdie
2011-09-22 15:25 ` Mark Hatle
0 siblings, 1 reply; 10+ messages in thread
From: Richard Purdie @ 2011-09-22 4:16 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2011-09-21 at 20:47 -0500, Mark Hatle wrote:
> Disable a few checks, and hard code the values for a few other items
> to work around potential host contamination issues. We also default
> to the cups configuration for items.
>
> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> ---
> .../foomatic/foomatic-filters_4.0.7.bb | 21 ++++++++++++++-----
> 1 files changed, 15 insertions(+), 6 deletions(-)
>
> diff --git a/meta/recipes-extended/foomatic/foomatic-filters_4.0.7.bb b/meta/recipes-extended/foomatic/foomatic-filters_4.0.7.bb
> index 9627187..856f5ac 100644
> --- a/meta/recipes-extended/foomatic/foomatic-filters_4.0.7.bb
> +++ b/meta/recipes-extended/foomatic/foomatic-filters_4.0.7.bb
> @@ -10,7 +10,7 @@ format using a printer-specific, but spooler-independent PPD file. \
> "
>
> DEPENDS += "cups perl libxml2"
> -PR = "r1"
> +PR = "r2"
>
> LICENSE = "GPLv2+"
> LIC_FILES_CHKSUM = "file://${WORKDIR}/foomatic-filters-${PV}/COPYING;md5=393a5ca445f6965873eca0259a17f833"
> @@ -20,11 +20,20 @@ SRC_URI = "http://www.openprinting.org/download/foomatic/foomatic-filters-${PV}.
> SRC_URI[md5sum] = "20abd25c1c98b2dae68709062a132a7d"
> SRC_URI[sha256sum] = "090313fae40b177f505d9c9b93d7a4d7188b6d5d18b6ae41ab24903ac983478d"
>
> -do_install_append_linuxstdbase() {
> - install -d ${D}${libdir}/cups/filter
> - ln -sf ${bindir}/foomatic-rip ${D}${libdir}/cups/filter
> +inherit autotools
> +
> +EXTRA_OECONF += "--disable-file-converter-check --with-file-converter=texttops"
> +
> +do_configure_prepend() {
> + export LIB_CUPS=/usr/lib/cups # /usr/lib NOT libdir
> + export CUPS_BACKENDS=/usr/lib/cups/backend # /usr/lib NOT libdir
> + export CUPS_FILTERS=/usr/lib/cups/filter # /usr/lib NOT libdir
> + export CUPS_PPDS=%{_datadir}/cups/model
> }
>
> -FILES_${PN}_append_linuxstdbase += "${libdir}/cups/filter/foomatic-rip"
> +do_install_append_linuxstdbase() {
> + install -d ${D}/usr/lib/cups/filter
> + ln -sf ${bindir}/foomatic-rip ${D}/usr/lib/cups/filter
> +}
>
> -inherit autotools
> +FILES_${PN}_append_linuxstdbase += "/usr/lib/cups/filter/foomatic-rip"
This needs a little more explaintion. What happens for the micro (or
minimal, I forget which) distro where they don't have /usr/ ?
I suspect you mean to use ${exec_prefix}/lib above...
Cheers,
Richard
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 0/6] Fix core-image-lsb dependencies
2011-09-22 1:46 [PATCH 0/6] Fix core-image-lsb dependencies Mark Hatle
` (5 preceding siblings ...)
2011-09-22 1:47 ` [PATCH 6/6] task-core-lsb: Remove perl-dev Mark Hatle
@ 2011-09-22 4:17 ` Richard Purdie
6 siblings, 0 replies; 10+ messages in thread
From: Richard Purdie @ 2011-09-22 4:17 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2011-09-21 at 20:46 -0500, Mark Hatle wrote:
> Fix additional dependencies found while building core-image-lsb. Most of
> the issues are related to simple errors in the recipes or PAM integration
> problems.
>
> The following changes since commit 40b52d9ed9b7b39bc86b3c87ae60fa6359cac265:
>
> distro tracking: Update Distro Aliases (2011-09-22 01:30:00 +0100)
>
> are available in the git repository at:
> git://git.pokylinux.org/poky-contrib mhatle/rpm
> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/rpm
>
> Mark Hatle (6):
> python: Fix cgi.py runtime issue
> usbutils: Move the pkgconfig file(s) to the -dev package
> foomatic-filters: Disable filter checking
> perl: Fix a few perl binaries to use target interpreter paths
> sudo: Fix PAM dependencies
> task-core-lsb: Remove perl-dev
Merged to master except for the foomatic one which needs some tweaks.
Cheers,
Richard
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 3/6] foomatic-filters: Disable filter checking
2011-09-22 4:16 ` Richard Purdie
@ 2011-09-22 15:25 ` Mark Hatle
0 siblings, 0 replies; 10+ messages in thread
From: Mark Hatle @ 2011-09-22 15:25 UTC (permalink / raw)
To: openembedded-core
On 9/21/11 11:16 PM, Richard Purdie wrote:
> On Wed, 2011-09-21 at 20:47 -0500, Mark Hatle wrote:
>> Disable a few checks, and hard code the values for a few other items
>> to work around potential host contamination issues. We also default
>> to the cups configuration for items.
>>
>> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
>> ---
>> .../foomatic/foomatic-filters_4.0.7.bb | 21 ++++++++++++++-----
>> 1 files changed, 15 insertions(+), 6 deletions(-)
>>
>> diff --git a/meta/recipes-extended/foomatic/foomatic-filters_4.0.7.bb b/meta/recipes-extended/foomatic/foomatic-filters_4.0.7.bb
>> index 9627187..856f5ac 100644
>> --- a/meta/recipes-extended/foomatic/foomatic-filters_4.0.7.bb
>> +++ b/meta/recipes-extended/foomatic/foomatic-filters_4.0.7.bb
>> @@ -10,7 +10,7 @@ format using a printer-specific, but spooler-independent PPD file. \
>> "
>>
>> DEPENDS += "cups perl libxml2"
>> -PR = "r1"
>> +PR = "r2"
>>
>> LICENSE = "GPLv2+"
>> LIC_FILES_CHKSUM = "file://${WORKDIR}/foomatic-filters-${PV}/COPYING;md5=393a5ca445f6965873eca0259a17f833"
>> @@ -20,11 +20,20 @@ SRC_URI = "http://www.openprinting.org/download/foomatic/foomatic-filters-${PV}.
>> SRC_URI[md5sum] = "20abd25c1c98b2dae68709062a132a7d"
>> SRC_URI[sha256sum] = "090313fae40b177f505d9c9b93d7a4d7188b6d5d18b6ae41ab24903ac983478d"
>>
>> -do_install_append_linuxstdbase() {
>> - install -d ${D}${libdir}/cups/filter
>> - ln -sf ${bindir}/foomatic-rip ${D}${libdir}/cups/filter
>> +inherit autotools
>> +
>> +EXTRA_OECONF += "--disable-file-converter-check --with-file-converter=texttops"
>> +
>> +do_configure_prepend() {
>> + export LIB_CUPS=/usr/lib/cups # /usr/lib NOT libdir
>> + export CUPS_BACKENDS=/usr/lib/cups/backend # /usr/lib NOT libdir
>> + export CUPS_FILTERS=/usr/lib/cups/filter # /usr/lib NOT libdir
>> + export CUPS_PPDS=%{_datadir}/cups/model
>> }
>>
>> -FILES_${PN}_append_linuxstdbase += "${libdir}/cups/filter/foomatic-rip"
>> +do_install_append_linuxstdbase() {
>> + install -d ${D}/usr/lib/cups/filter
>> + ln -sf ${bindir}/foomatic-rip ${D}/usr/lib/cups/filter
>> +}
>>
>> -inherit autotools
>> +FILES_${PN}_append_linuxstdbase += "/usr/lib/cups/filter/foomatic-rip"
>
> This needs a little more explaintion. What happens for the micro (or
> minimal, I forget which) distro where they don't have /usr/ ?
>
> I suspect you mean to use ${exec_prefix}/lib above...
These are items that, as far as I know, are only useful with cups and a "full
system" configuration. CUPS is hard coded to use "/usr/lib" for these files.
Previously the configure was loading values from the host system which may or
may not match our CUPS configuration.
If both cups and foomatic-filters need to work in an environment where /usr may
not be present, we'll need to adjust both for that.
--Mark
> Cheers,
>
> Richard
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2011-09-22 15:30 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-22 1:46 [PATCH 0/6] Fix core-image-lsb dependencies Mark Hatle
2011-09-22 1:47 ` [PATCH 1/6] python: Fix cgi.py runtime issue Mark Hatle
2011-09-22 1:47 ` [PATCH 2/6] usbutils: Move the pkgconfig file(s) to the -dev package Mark Hatle
2011-09-22 1:47 ` [PATCH 3/6] foomatic-filters: Disable filter checking Mark Hatle
2011-09-22 4:16 ` Richard Purdie
2011-09-22 15:25 ` Mark Hatle
2011-09-22 1:47 ` [PATCH 4/6] perl: Fix a few perl binaries to use target interpreter paths Mark Hatle
2011-09-22 1:47 ` [PATCH 5/6] sudo: Fix PAM dependencies Mark Hatle
2011-09-22 1:47 ` [PATCH 6/6] task-core-lsb: Remove perl-dev Mark Hatle
2011-09-22 4:17 ` [PATCH 0/6] Fix core-image-lsb dependencies Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox