[PATCH 0/1] eglibc Packaging fix

[PATCH 0/1] eglibc Packaging fix

[Saul Wold]

Richard,

This is the correct fix for the eglibc packaging issue, the one that got
pulled was an under test at the time you pulled it.

Sorry for the confusion.

Sau!


The following changes since commit 910452727fc277c1caec7612b36c37b58d845350:

  eglibc: Add patch to fix /var installation location (2012-05-09 21:42:37 +0100)

are available in the git repository at:
  git://git.openembedded.org/openembedded-core-contrib sgw/fix
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fix

Saul Wold (1):
  eglibc: Add patch to fix /var installation location

 ....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%)

-- 
1.7.7.6

[PATCH 1/1] eglibc: Add patch to fix /var installation location

[Saul Wold]

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>
---
 ....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 4c83aa2..8392c18 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 e61816d..65ce9d3 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 \
-- 
1.7.7.6