From 22a2297c712d3b3ca0335197943483218c92ef3e Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Wed, 9 May 2012 11:08:57 -0700 Subject: [PATCH] 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 --- ...ix-to-var.patch => use-localstatedir-for-vardbdir.patch} | 6 ++++-- meta/recipes-core/eglibc/eglibc_2.15.bb | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) rename meta/recipes-core/eglibc/eglibc-2.15/{add-prefix-to-var.patch => use-localstatedir-for-vardbdir.patch} (74%) 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 similarity index 74% rename from meta/recipes-core/eglibc/eglibc-2.15/add-prefix-to-var.patch rename to meta/recipes-core/eglibc/eglibc-2.15/use-localstatedir-for-vardbdir.patch index 4c83aa25dd..8392c1806d 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 - 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 e61816d884..65ce9d3cbc 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 \ -- 2.40.1