diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-03 13:03:01 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-03 13:03:01 +0100 |
| commit | c52c6a6821033aad9ab492ab75845098b879c87d (patch) | |
| tree | a0275c0dcac78da55d01683c72cd716a3e38d10d | |
| parent | ef7a634b37a36fc8ac59e67fe8b6583f713a31c4 (diff) | |
| parent | b52a881b03cdd926ec06ccaca7b4d7d63fc3cb8c (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | mk/image.mk | 10 | ||||
| -rw-r--r-- | target/config/Config.in | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mk/image.mk b/mk/image.mk index 3f199c9cc..ec61ff374 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -145,7 +145,7 @@ ${FW_DIR}/${ROOTFSUSERTARBALL}: ${TARGET_DIR} sed "s#\(.*\)#:0:0::::::\1#" | sort | \ ${STAGING_HOST_DIR}/usr/bin/cpio -o -Hustar -P | gzip -n9 >$@ -${FW_DIR}/${INITRAMFS}_list: ${TARGET_DIR} +${STAGING_TARGET_DIR}/${INITRAMFS}_list: ${TARGET_DIR} $(BASH) ${LINUX_DIR}/scripts/gen_initramfs_list.sh -u squash -g squash \ ${TARGET_DIR}/ >$@ ( \ @@ -159,8 +159,8 @@ ${FW_DIR}/${INITRAMFS}_list: ${TARGET_DIR} echo "nod /dev/ram 0655 0 0 b 1 1"; \ ) >>$@ -${FW_DIR}/${INITRAMFS}: ${FW_DIR}/${INITRAMFS}_list - ${LINUX_DIR}/usr/gen_init_cpio ${FW_DIR}/${INITRAMFS}_list | \ +${FW_DIR}/${INITRAMFS}: ${STAGING_TARGET_DIR}/${INITRAMFS}_list + ${LINUX_DIR}/usr/gen_init_cpio ${STAGING_TARGET_DIR}/${INITRAMFS}_list | \ ${ADK_COMPRESSION_TOOL} -c >$@ ${BUILD_DIR}/root.squashfs: ${TARGET_DIR} @@ -172,13 +172,13 @@ ${FW_DIR}/${ROOTFSJFFS2}: ${TARGET_DIR} ${STAGING_HOST_DIR}/usr/bin/mkfs.jffs2 $(ADK_JFFS2_OPTS) -q -r ${TARGET_DIR} \ --pad=$(ADK_TARGET_MTD_SIZE) -o ${FW_DIR}/${ROOTFSJFFS2} $(MAKE_TRACE) -createinitramfs: ${FW_DIR}/${INITRAMFS}_list +createinitramfs: ${STAGING_TARGET_DIR}/${INITRAMFS}_list ${SED} 's/.*CONFIG_(BLK_DEV_INITRD|INITRAMFS_SOURCE|INITRAMFS_COMPRESSION).*//' \ ${LINUX_DIR}/.config ( \ echo "CONFIG_BLK_DEV_INITRD=y"; \ echo "CONFIG_ACPI_INITRD_TABLE_OVERRIDE=n"; \ - echo 'CONFIG_INITRAMFS_SOURCE="${FW_DIR}/${INITRAMFS}_list"'; \ + echo 'CONFIG_INITRAMFS_SOURCE="${STAGING_TARGET_DIR}/${INITRAMFS}_list"'; \ echo '# CONFIG_INITRAMFS_COMPRESSION_NONE is not set'; \ echo 'CONFIG_INITRAMFS_ROOT_UID=0'; \ echo 'CONFIG_INITRAMFS_ROOT_GID=0'; \ diff --git a/target/config/Config.in b/target/config/Config.in index c8e566cc8..44ee685fe 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -180,7 +180,7 @@ endchoice config ADK_TARGET_LIBC_PATH string default "lib32" if ADK_n32 - default "lib" if ADK_x32 + default "libx32" if ADK_x32 default "lib64" if ADK_n64 \ || ADK_64 \ || ADK_LINUX_SPARC64 \ |