diff options
author | Saul Wold <sgw@linux.intel.com> | 2012-05-09 11:08:57 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-11 17:50:50 +0100 |
commit | 2e1974d774a0e1850cbf3e7a8a2f39729ad1b816 (patch) | |
tree | e35d050450e317326a7e0b4da9e94ffe71b24a93 /meta/recipes-core | |
parent | b88a0e58766a5e43f2a8f24eed2f1549f9299966 (diff) | |
download | poky-2e1974d774a0e1850cbf3e7a8a2f39729ad1b816.tar.gz |
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
(From OE-Core rev: 22a2297c712d3b3ca0335197943483218c92ef3e)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-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.bb | 4 |
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 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 @@ | |||
1 | 1 | ||
2 | localstatedir is set to be the /var directory, so use | ||
3 | it for the base of the vardbdir so it's properly relocatable. | ||
4 | |||
2 | Upstream-Status: Pending | 5 | Upstream-Status: Pending |
3 | 6 | ||
4 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | 7 | Signed-off-by: Saul Wold <sgw@linux.intel.com> |
5 | 8 | ||
6 | |||
7 | Index: libc/Makeconfig | 9 | Index: libc/Makeconfig |
8 | =================================================================== | 10 | =================================================================== |
9 | --- libc.orig/Makeconfig | 11 | --- libc.orig/Makeconfig |
@@ -13,7 +15,7 @@ Index: libc/Makeconfig | |||
13 | # Directory for the database files and Makefile for nss_db. | 15 | # Directory for the database files and Makefile for nss_db. |
14 | ifndef vardbdir | 16 | ifndef vardbdir |
15 | -vardbdir = /var/db | 17 | -vardbdir = /var/db |
16 | +vardbdir = $(prefix)/var/db | 18 | +vardbdir = $(localstatedir)/db |
17 | endif | 19 | endif |
18 | inst_vardbdir = $(install_root)$(vardbdir) | 20 | inst_vardbdir = $(install_root)$(vardbdir) |
19 | 21 | ||
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 | |||
3 | SRCREV = "17386" | 3 | SRCREV = "17386" |
4 | 4 | ||
5 | DEPENDS += "gperf-native" | 5 | DEPENDS += "gperf-native" |
6 | PR = "r8" | 6 | PR = "r9" |
7 | PR_append = "+svnr${SRCPV}" | 7 | PR_append = "+svnr${SRCPV}" |
8 | 8 | ||
9 | EGLIBC_BRANCH="eglibc-2_15" | 9 | EGLIBC_BRANCH="eglibc-2_15" |
@@ -23,7 +23,7 @@ SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http | |||
23 | file://ppc-sqrt_finite.patch \ | 23 | file://ppc-sqrt_finite.patch \ |
24 | file://GLRO_dl_debug_mask.patch \ | 24 | file://GLRO_dl_debug_mask.patch \ |
25 | file://initgroups_keys.patch \ | 25 | file://initgroups_keys.patch \ |
26 | file://add-prefix-to-var.patch \ | 26 | file://use-localstatedir-for-vardbdir.patch \ |
27 | " | 27 | " |
28 | LIC_FILES_CHKSUM = "file://LICENSES;md5=98a1128c4b58120182cbea3b1752d8b9 \ | 28 | LIC_FILES_CHKSUM = "file://LICENSES;md5=98a1128c4b58120182cbea3b1752d8b9 \ |
29 | file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \ | 29 | file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \ |