From 22a2297c712d3b3ca0335197943483218c92ef3e Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Wed, 9 May 2012 11:08:57 -0700 Subject: 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 --- .../eglibc/eglibc-2.15/add-prefix-to-var.patch | 19 ------------------- .../use-localstatedir-for-vardbdir.patch | 21 +++++++++++++++++++++ meta/recipes-core/eglibc/eglibc_2.15.bb | 4 ++-- 3 files changed, 23 insertions(+), 21 deletions(-) delete mode 100644 meta/recipes-core/eglibc/eglibc-2.15/add-prefix-to-var.patch create mode 100644 meta/recipes-core/eglibc/eglibc-2.15/use-localstatedir-for-vardbdir.patch diff --git a/meta/recipes-core/eglibc/eglibc-2.15/add-prefix-to-var.patch b/meta/recipes-core/eglibc/eglibc-2.15/add-prefix-to-var.patch deleted file mode 100644 index 4c83aa25d..000000000 --- a/meta/recipes-core/eglibc/eglibc-2.15/add-prefix-to-var.patch +++ /dev/null @@ -1,19 +0,0 @@ - -Upstream-Status: Pending - -Signed-off-by: Saul Wold - - -Index: libc/Makeconfig -=================================================================== ---- libc.orig/Makeconfig -+++ libc/Makeconfig -@@ -293,7 +293,7 @@ inst_sysconfdir = $(install_root)$(sysco - - # Directory for the database files and Makefile for nss_db. - ifndef vardbdir --vardbdir = /var/db -+vardbdir = $(prefix)/var/db - endif - inst_vardbdir = $(install_root)$(vardbdir) - diff --git a/meta/recipes-core/eglibc/eglibc-2.15/use-localstatedir-for-vardbdir.patch b/meta/recipes-core/eglibc/eglibc-2.15/use-localstatedir-for-vardbdir.patch new file mode 100644 index 000000000..8392c1806 --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.15/use-localstatedir-for-vardbdir.patch @@ -0,0 +1,21 @@ + +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 ++++ libc/Makeconfig +@@ -293,7 +293,7 @@ inst_sysconfdir = $(install_root)$(sysco + + # Directory for the database files and Makefile for nss_db. + ifndef vardbdir +-vardbdir = /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 \ -- cgit v1.2.3