diff options
| author | Jon Ringle <jon@ringle.org> | 2009-10-28 13:23:12 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-11-04 13:56:44 +0100 |
| commit | e7283c31751a1b383bb0485170785003ed434208 (patch) | |
| tree | 45c02d1078bac2b7935f496a599ada3147178915 /scripts | |
| parent | 6289ef9acd0dc09ae5c614b11b8423a70bb3dc09 (diff) | |
| download | ptxdist-e7283c31751a1b383bb0485170785003ed434208.tar.gz ptxdist-e7283c31751a1b383bb0485170785003ed434208.tar.xz | |
[ptxdist] add klibc- packages infrastructure
Signed-off-by: Jon Ringle <jon@ringle.org>
[mkl: split into smaller patches, add support for generic extract stage]
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/ptxd_make_world_install.sh | 14 | ||||
| -rw-r--r-- | scripts/ptxdist_vars.sh | 1 |
2 files changed, 12 insertions, 3 deletions
diff --git a/scripts/lib/ptxd_make_world_install.sh b/scripts/lib/ptxd_make_world_install.sh index d0892274f..84323430b 100644 --- a/scripts/lib/ptxd_make_world_install.sh +++ b/scripts/lib/ptxd_make_world_install.sh @@ -54,11 +54,19 @@ ptxd_make_world_install_target() { return fi && + local sysroot + case "${pkg_stamp}" in + initramfs-*|klibc-*) + sysroot="${PTXDIST_SYSROOT_TARGET}/usr/lib/klibc" ;; + *) + sysroot="${PTXDIST_SYSROOT_TARGET}" ;; + esac + # prefix paths in la files with sysroot find "${pkg_pkgdir}" -name "*.la" -print0 | xargs -r -0 -- \ sed -i \ - -e "/^dependency_libs/s:\( \)\(/lib\|/usr/lib\):\1${PTXDIST_SYSROOT_TARGET}\2:g" \ - -e "/^libdir=/s:\(libdir='\)\(/lib\|/usr/lib\):\1${PTXDIST_SYSROOT_TARGET}\2:g" && + -e "/^dependency_libs/s:\( \)\(/lib\|/usr/lib\):\1${sysroot}\2:g" \ + -e "/^libdir=/s:\(libdir='\)\(/lib\|/usr/lib\):\1${sysroot}\2:g" && check_pipe_status && # make pkgconfig's pc files relocatable @@ -66,7 +74,7 @@ ptxd_make_world_install_target() { xargs -r -0 gawk -f "${PTXDIST_LIB_DIR}/ptxd_make_world_install_mangle_pc.awk" check_pipe_status && - cp -dprf -- "${pkg_pkgdir}"/* "${PTXDIST_SYSROOT_TARGET}" + cp -dprf -- "${pkg_pkgdir}"/* "${sysroot}" } export -f ptxd_make_world_install_target diff --git a/scripts/ptxdist_vars.sh b/scripts/ptxdist_vars.sh index feb395b44..35dbdd5bc 100644 --- a/scripts/ptxdist_vars.sh +++ b/scripts/ptxdist_vars.sh @@ -15,6 +15,7 @@ PROJECTPOSTRULESDIR=${PTXDIST_WORKSPACE}/rules/post # created dirs during build BUILDDIR=${PTXDIST_PLATFORMDIR}/build-target +KLIBC_BUILDDIR=${PTXDIST_PLATFORMDIR}/build-target-klibc CROSS_BUILDDIR=${PTXDIST_PLATFORMDIR}/build-cross HOST_BUILDDIR=${PTXDIST_PLATFORMDIR}/build-host PKGDIR=${PTXDIST_PLATFORMDIR}/packages |