mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-30 00:50:00 +00:00
Code Issues Projects Releases Wiki Activity

klibc_2.0.2: refactor recipe to respect exec_prefix

Browse Source 
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
This commit is contained in:
Andrea Adami
2013-08-30 01:11:29 +02:00
committed by Paul Eggleton
parent 72e23c1229
commit 123c38942d
5 changed files with 15 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/klibc-linux-libc-dev.patch
+1 -1
View File
@@ -14,7 +14,7 @@ Index: klibc-2.0~rc2/scripts/Kbuild.install
$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
- $(Q)$(MAKE) -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install - $(Q)$(MAKE) -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install
+ $(Q)for x in $(KLIBCKERNELSRC)/include/asm $(KLIBCKERNELSRC)/include/asm* $(KLIBCKERNELSRC)/include/linux $(KLIBCKERNELSRC)/include/mtd; do \ + $(Q)for x in ../../../include/asm ../../../include/asm-generic ../../../include/linux ../../../include/mtd; do \
+ ln -sf $${x} $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \ + ln -sf $${x} $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \
+ done + done
$(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/. $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/prefix.patch
-14
View File
@@ -1,14 +0,0 @@
Index: klibc-1.5.24/Makefile
===================================================================
--- a/Makefile 2011-07-27 15:50:53.000000000 +0200
+++ b/Makefile 2011-08-01 00:47:56.000000000 +0200
@@ -39,7 +39,7 @@
export PERL := perl
# Location for installation
-export prefix = /usr
+export prefix = $(INST)
export bindir = $(prefix)/bin
export libdir = $(prefix)/lib
export mandir = $(prefix)/man
meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/staging.patch
+1 -1
View File
@@ -21,7 +21,7 @@ Index: klibc-1.5.24/scripts/Kbuild.install
$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
- $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin - $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
$(Q)for x in $(KLIBCKERNELSRC)/include/asm $(KLIBCKERNELSRC)/include/asm* $(KLIBCKERNELSRC)/include/linux $(KLIBCKERNELSRC)/include/mtd; do \ $(Q)for x in ../../../include/asm ../../../include/asm-generic ../../../include/linux ../../../include/mtd; do \
ln -sf $${x} $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \ ln -sf $${x} $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \
done done
@@ -103,7 +100,6 @@ @@ -103,7 +100,6 @@
meta-initramfs/recipes-devtools/klibc/klibc.inc
+3 -1
View File
@@ -37,7 +37,6 @@ SRC_URI_append_linux-uclibceabi = " file://klibc-config-eabi.patch \
" "
SRC_URI += "file://klibc-linux-libc-dev.patch \ SRC_URI += "file://klibc-linux-libc-dev.patch \
file://prefix.patch \
file://staging.patch \ file://staging.patch \
" "
@@ -46,6 +45,9 @@ S = "${WORKDIR}/git"
EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \ EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \
'CROSS_COMPILE=${TARGET_PREFIX}' \ 'CROSS_COMPILE=${TARGET_PREFIX}' \
'KLIBCKERNELSRC=${STAGING_DIR_TARGET}${exec_prefix}' \ 'KLIBCKERNELSRC=${STAGING_DIR_TARGET}${exec_prefix}' \
'prefix=${exec_prefix}' \
'INSTALLROOT=${D}' \
'SHLIBDIR=${libdir}' \
" "
do_configure () { do_configure () {
meta-initramfs/recipes-devtools/klibc/klibc_2.0.2.bb
+10 -12
View File
@@ -1,27 +1,25 @@
PR = "${INC_PR}.0" PR = "${INC_PR}.0"
export INST = "${D}"
do_install() { do_install() {
oe_runmake install oe_runmake install
# the crosscompiler is packaged by klcc-cross # the crosscompiler is packaged by klcc-cross
# remove klcc # remove klcc
rm ${D}${base_bindir}/klcc rm ${D}${bindir}/klcc
# remove now empty dir # remove now empty dir
rmdir ${D}${base_bindir} rmdir ${D}${bindir}
install -d ${D}${base_libdir} install -d ${D}${libdir}
install -m 755 usr/klibc/klibc-*.so ${D}${base_libdir} install -m 755 usr/klibc/klibc-*.so ${D}${libdir}
(cd ${D}${base_libdir}; ln -s klibc-*.so klibc.so) (cd ${D}${libdir}; ln -s klibc-*.so klibc.so)
} }
PACKAGES = "libklibc libklibc-staticdev libklibc-dev" PACKAGES = "libklibc libklibc-staticdev libklibc-dev"
FILES_libklibc = "${base_libdir}/klibc-*.so" FILES_libklibc = "${libdir}/klibc-*.so"
FILES_libklibc-staticdev = "${base_libdir}/klibc/lib/libc.a" FILES_libklibc-staticdev = "${libdir}/klibc/lib/libc.a"
FILES_libklibc-dev = "${base_libdir}/klibc.so \ FILES_libklibc-dev = "${libdir}/klibc.so \
${base_libdir}/klibc/lib/* \ ${libdir}/klibc/lib/* \
${base_libdir}/klibc/include/* \ ${libdir}/klibc/include/* \
" "
require klibc.inc require klibc.inc
SUMMARY = "klibc, a small C library for use with initramfs" SUMMARY = "klibc, a small C library for use with initramfs"