summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-05-09 11:08:57 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-11 17:50:03 +0100
commit22a2297c712d3b3ca0335197943483218c92ef3e (patch)
tree5f147cbf0fe5c7c6c158fa547d1d9a3bde202a15 /meta
parentac4201b714c83c614113bfa735d0a2fc6f64db99 (diff)
downloadopenembedded-core-22a2297c712d3b3ca0335197943483218c92ef3e.tar.gz
openembedded-core-22a2297c712d3b3ca0335197943483218c92ef3e.tar.bz2
openembedded-core-22a2297c712d3b3ca0335197943483218c92ef3e.tar.xz
openembedded-core-22a2297c712d3b3ca0335197943483218c92ef3e.zip
eglibc: Add patch to fix /var installation location
This address the packaging issues since it's installed in the wrong place ERROR: For recipe eglibc-nativesdk, the following files/directories were installed but not shipped in any package: ERROR: /var ERROR: /var/db ERROR: /var/db/Makefile Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.15/use-localstatedir-for-vardbdir.patch (renamed from meta/recipes-core/eglibc/eglibc-2.15/add-prefix-to-var.patch)6
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.15.bb4
2 files changed, 6 insertions, 4 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-2.15/add-prefix-to-var.patch b/meta/recipes-core/eglibc/eglibc-2.15/use-localstatedir-for-vardbdir.patch
index 4c83aa25d..8392c1806 100644
--- a/meta/recipes-core/eglibc/eglibc-2.15/add-prefix-to-var.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.15/use-localstatedir-for-vardbdir.patch
@@ -1,9 +1,11 @@
+localstatedir is set to be the /var directory, so use
+it for the base of the vardbdir so it's properly relocatable.
+
Upstream-Status: Pending
Signed-off-by: Saul Wold <sgw@linux.intel.com>
-
Index: libc/Makeconfig
===================================================================
--- libc.orig/Makeconfig
@@ -13,7 +15,7 @@ Index: libc/Makeconfig
# Directory for the database files and Makefile for nss_db.
ifndef vardbdir
-vardbdir = /var/db
-+vardbdir = $(prefix)/var/db
++vardbdir = $(localstatedir)/db
endif
inst_vardbdir = $(install_root)$(vardbdir)
diff --git a/meta/recipes-core/eglibc/eglibc_2.15.bb b/meta/recipes-core/eglibc/eglibc_2.15.bb
index e61816d88..65ce9d3cb 100644
--- a/meta/recipes-core/eglibc/eglibc_2.15.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.15.bb
@@ -3,7 +3,7 @@ require eglibc.inc
SRCREV = "17386"
DEPENDS += "gperf-native"
-PR = "r8"
+PR = "r9"
PR_append = "+svnr${SRCPV}"
EGLIBC_BRANCH="eglibc-2_15"
@@ -23,7 +23,7 @@ SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http
file://ppc-sqrt_finite.patch \
file://GLRO_dl_debug_mask.patch \
file://initgroups_keys.patch \
- file://add-prefix-to-var.patch \
+ file://use-localstatedir-for-vardbdir.patch \
"
LIC_FILES_CHKSUM = "file://LICENSES;md5=98a1128c4b58120182cbea3b1752d8b9 \
file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \