diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-06 20:43:57 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-06 20:43:57 +0100 |
| commit | 0151157c0f04799a8c4673fc430c6bfebda83d7e (patch) | |
| tree | 0eabaed966bd7256865c8ce29ea5f997f618909c /toolchain | |
| parent | d9c9f5dfecc6d6cb24d45d478e0e7147d9c6f2dc (diff) | |
fix qemu-x86_64 image, get rid of duplicat include dir
- fix image build for different root filesystems
- get rid of duplicate symlink to include dir
- finetune mpd config file
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/kernel-headers/Makefile | 4 | ||||
| -rw-r--r-- | toolchain/uClibc/Makefile | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile index 400141524..d13da8141 100644 --- a/toolchain/kernel-headers/Makefile +++ b/toolchain/kernel-headers/Makefile @@ -14,8 +14,8 @@ $(WRKBUILD)/.headers: INSTALL_HDR_PATH=$(TOOLCHAIN_SYSROOT)/usr \ headers_install # cryptodev.h from ocf-linux-20080917 - mkdir -p ${STAGING_DIR}/include/crypto - cp files/cryptodev.h ${STAGING_DIR}/include/crypto/ + mkdir -p ${STAGING_DIR}/usr/include/crypto + cp files/cryptodev.h ${STAGING_DIR}/usr/include/crypto/ ifeq ($(ARCH),cris) ifeq ($(CPU_ARCH),crisv32) cd $(STAGING_DIR)/usr/include && ln -sf arch-v32/arch arch diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index 2bca1bb23..4c3207c4a 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -25,9 +25,9 @@ ifneq ($(ADK_DEBUG),) $(SED) 's,DOSTRIP,DODEBUG,' ${WRKBUILD}/.config endif $(MAKE) -C $(WRKBUILD) \ - PREFIX=$(TOOLCHAIN_SYSROOT)/ \ + PREFIX=$(TOOLCHAIN_SYSROOT) \ DEVEL_PREFIX=/usr/ \ - RUNTIME_PREFIX=$(TOOLCHAIN_SYSROOT)/ \ + RUNTIME_PREFIX=$(TOOLCHAIN_SYSROOT) \ HOSTCC="$(HOSTCC)" \ CPU_CFLAGS="$(TARGET_CFLAGS)" \ install_headers @@ -47,7 +47,7 @@ $(WRKBUILD)/.compiled: $(WRKBUILD)/.install_headers: $(WRKBUILD)/.compiled $(MAKE) -C $(WRKBUILD) \ PREFIX=$(STAGING_DIR) \ - DEVEL_PREFIX=/ \ + DEVEL_PREFIX=/usr/ \ RUNTIME_PREFIX=/ \ CPU_CFLAGS="$(TARGET_CFLAGS)" \ install_dev @@ -56,7 +56,7 @@ $(WRKBUILD)/.install_headers: $(WRKBUILD)/.compiled $(WRKBUILD)/.installed: $(WRKBUILD)/.install_headers $(MAKE) -C $(WRKBUILD) \ PREFIX=$(STAGING_DIR) \ - DEVEL_PREFIX=/ \ + DEVEL_PREFIX=/usr/ \ RUNTIME_PREFIX=/ \ CPU_CFLAGS="$(TARGET_CFLAGS)" \ install_runtime |