diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-22 22:45:05 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-22 22:45:05 +0100 |
| commit | 6c3f7bc5593343058ab91c0b504fd67d3c0d1269 (patch) | |
| tree | f57aae2e39a3e60895f08b6e93e95d1d5af1c8c5 /target | |
| parent | 52549131197cd42dd61b50721e3f68e3d7585ec7 (diff) | |
| parent | 3953de124e87ce3b594fd861b6f111b2df706753 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
| -rw-r--r-- | target/packages/pkg-available/development | 5 | ||||
| -rw-r--r-- | target/packages/pkg-available/laptop | 1 | ||||
| -rw-r--r-- | target/tools/mkfimage/Makefile | 4 | ||||
| -rw-r--r-- | target/tools/squashfs/Makefile | 2 | ||||
| -rw-r--r-- | target/tools/squashfs/patches/honour-cflags.patch | 2 | ||||
| -rw-r--r-- | target/tools/uboot-mkimage/Makefile | 4 |
6 files changed, 10 insertions, 8 deletions
diff --git a/target/packages/pkg-available/development b/target/packages/pkg-available/development index 6b6498749..bf479c1c5 100644 --- a/target/packages/pkg-available/development +++ b/target/packages/pkg-available/development @@ -9,7 +9,7 @@ config ADK_PKG_DEVELOPMENT select ADK_PACKAGE_GAWK select ADK_PACKAGE_GCC select ADK_PACKAGE_GIT - select ADK_PACKAGE_GREP + #select ADK_PACKAGE_GREP select ADK_PACKAGE_UCLIBC_DEV if ADK_TARGET_LIB_UCLIBC select ADK_PACKAGE_EGLIBC_DEV if ADK_TARGET_LIB_EGLIBC select ADK_PACKAGE_GLIBC_DEV if ADK_TARGET_LIB_GLIBC @@ -17,10 +17,11 @@ config ADK_PKG_DEVELOPMENT select ADK_PACKAGE_LIBNCURSES_DEV select ADK_PACKAGE_M4 select ADK_PACKAGE_MAKE - select ADK_PACKAGE_PATCH + #select ADK_PACKAGE_PATCH select ADK_PACKAGE_PKG_CONFIG select ADK_PACKAGE_MICROPERL select ADK_PACKAGE_TSORT + select BUSYBOX_PATCH select BUSYBOX_STAT select BUSYBOX_FEATURE_STAT_FORMAT select BUSYBOX_TR diff --git a/target/packages/pkg-available/laptop b/target/packages/pkg-available/laptop index b4b5a7600..1d0185550 100644 --- a/target/packages/pkg-available/laptop +++ b/target/packages/pkg-available/laptop @@ -12,6 +12,7 @@ config ADK_PKG_LAPTOP select ADK_PACKAGE_OPENSC select ADK_PACKAGE_PCSC_LITE select ADK_PACKAGE_CCID + select ADK_PACKAGE_ALSA_UTILS select ADK_PACKAGE_OPENSSL_PKCS11 select ADK_PACKAGE_OPENSSH_CLIENT select ADK_PACKAGE_OPENSSH_CLIENT_UTILS diff --git a/target/tools/mkfimage/Makefile b/target/tools/mkfimage/Makefile index 82e645285..a72cfdff1 100644 --- a/target/tools/mkfimage/Makefile +++ b/target/tools/mkfimage/Makefile @@ -1,4 +1,4 @@ include $(TOPDIR)/rules.mk -all: - $(HOSTCC) ${HOSTCFLAGS} -o ${STAGING_HOST_DIR}/bin/mkfimage mkfimage.c +all: mkfimage.c + $(CC_FOR_BUILD) ${FLAGS_FOR_BUILD} -o ${STAGING_HOST_DIR}/bin/mkfimage mkfimage.c diff --git a/target/tools/squashfs/Makefile b/target/tools/squashfs/Makefile index 536a5e6ba..bcc966274 100644 --- a/target/tools/squashfs/Makefile +++ b/target/tools/squashfs/Makefile @@ -17,7 +17,7 @@ include ../rules.mk all: ${STAGING_HOST_DIR}/bin/mksquashfs $(WRKBUILD)/.compiled: ${WRKDIST}/.prepared - ${MAKE} -C ${WRKBUILD}/squashfs-tools CC='${HOSTCC}' + ${MAKE} -C ${WRKBUILD}/squashfs-tools CC='${CC_FOR_BUILD}' touch $@ ${STAGING_HOST_DIR}/bin/mksquashfs: $(WRKBUILD)/.compiled diff --git a/target/tools/squashfs/patches/honour-cflags.patch b/target/tools/squashfs/patches/honour-cflags.patch index 2ee7de909..a50d94263 100644 --- a/target/tools/squashfs/patches/honour-cflags.patch +++ b/target/tools/squashfs/patches/honour-cflags.patch @@ -5,7 +5,7 @@ INCLUDEDIR = . -CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2 -+CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2 ${HOSTCFLAGS} ++CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2 ${CFLAGS_FOR_BUILD} all: mksquashfs unsquashfs diff --git a/target/tools/uboot-mkimage/Makefile b/target/tools/uboot-mkimage/Makefile index c9d85a28e..e93964ff2 100644 --- a/target/tools/uboot-mkimage/Makefile +++ b/target/tools/uboot-mkimage/Makefile @@ -1,4 +1,4 @@ include $(TOPDIR)/rules.mk -all: - $(HOSTCC) ${HOSTCFLAGS} -o ${STAGING_HOST_DIR}/bin/mkimage mkimage.c crc32.c +all: mkimage.c crc32.c + $(CC_FOR_BUILD) ${FLAGS_FOR_BUILD} -o ${STAGING_HOST_DIR}/bin/mkimage mkimage.c crc32.c |