diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-13 20:56:16 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-13 20:56:16 +0200 |
| commit | 877be3fafdc3da53e53b5f426e81d9fff6a6e8f1 (patch) | |
| tree | 58a17993a64d55d4395d8a243d08401120a53f13 /mk | |
| parent | 36841087cc538f25c9791b0191766780842f1003 (diff) | |
| parent | 7297ef1c47935fb17e49cac8379908e631763566 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 2 | ||||
| -rw-r--r-- | mk/image.mk | 8 | ||||
| -rw-r--r-- | mk/rootfs.mk | 6 | ||||
| -rw-r--r-- | mk/vars.mk | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/mk/build.mk b/mk/build.mk index 04cd5e3ce..13e287d89 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -44,6 +44,7 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PKG_DEVELOPMENT=n \ ADK_TOOLCHAIN_USE_SSP=n \ ADK_TOOLCHAIN_USE_LTO=n \ + ADK_TOOLCHAIN_GOLD=n \ ADK_TOOLCHAIN_USE_GOLD=n \ BUSYBOX_IFPLUGD=n \ BUSYBOX_EXTRA_COMPAT=n \ @@ -236,6 +237,7 @@ root_clean: @$(TRACE) root_clean rm -rf $(TARGET_DIR) mkdir -p $(TARGET_DIR) + touch $(TARGET_DIR)/.adk # Do a per-package clean here, too. This way stale headers and # libraries from target_*/ get wiped away, which keeps diff --git a/mk/image.mk b/mk/image.mk index 9e755ad1a..9f3fd5eef 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -138,17 +138,17 @@ ROOTFSUSERTARBALL= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.tar. ROOTFSISO= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}.iso endif -${FW_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR} kernel-package +${FW_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR}/.adk kernel-package cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | \ sed "s#\(.*\)#:0:0::::::\1#" | sort | \ ${STAGING_HOST_DIR}/usr/bin/cpio -o -Hustar -P | gzip -n9 >$@ -${FW_DIR}/${ROOTFSUSERTARBALL}: ${TARGET_DIR} +${FW_DIR}/${ROOTFSUSERTARBALL}: ${TARGET_DIR}/.adk cd ${TARGET_DIR}; find . | grep -v ./boot/ | sed -n '/^\.\//s///p' | \ sed "s#\(.*\)#:0:0::::::\1#" | sort | \ ${STAGING_HOST_DIR}/usr/bin/cpio -o -Hustar -P | gzip -n9 >$@ -${STAGING_TARGET_DIR}/${INITRAMFS}_list: ${TARGET_DIR} +${STAGING_TARGET_DIR}/${INITRAMFS}_list: ${TARGET_DIR}/.adk env PATH='${HOST_PATH}' $(BASH) ${LINUX_DIR}/scripts/gen_initramfs_list.sh -u squash -g squash \ ${TARGET_DIR}/ >$@ @@ -156,7 +156,7 @@ ${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} +${BUILD_DIR}/root.squashfs: ${TARGET_DIR}/.adk ${STAGING_HOST_DIR}/usr/bin/mksquashfs ${TARGET_DIR} \ ${BUILD_DIR}/root.squashfs -comp xz \ -nopad -noappend -root-owned $(MAKE_TRACE) diff --git a/mk/rootfs.mk b/mk/rootfs.mk index dae0e5805..3c434b038 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -44,9 +44,9 @@ endif $(eval $(call rootfs_template,usb,USB,$(USB))) $(eval $(call rootfs_template,archive,ARCHIVE,$(ROOTFS))) -$(eval $(call rootfs_template,initramfsarchive,INITRAMFSARCHIVE)) -$(eval $(call rootfs_template,initramfs,INITRAMFS)) -$(eval $(call rootfs_template,initramfs-piggyback,INITRAMFS_PIGGYBACK)) +$(eval $(call rootfs_template,initramfsarchive,INITRAMFSARCHIVE,rootfstype=tmpfs)) +$(eval $(call rootfs_template,initramfs,INITRAMFS,rootfstype=tmpfs)) +$(eval $(call rootfs_template,initramfs-piggyback,INITRAMFS_PIGGYBACK,rootfstype=tmpfs)) $(eval $(call rootfs_template,squashfs,SQUASHFS,$(MTDDEV) rootfstype=squashfs)) $(eval $(call rootfs_template,yaffs,YAFFS,$(MTDDEV) panic=3)) $(eval $(call rootfs_template,jffs2,JFFS2,$(MTDDEV) rootfstype=jffs2)) diff --git a/mk/vars.mk b/mk/vars.mk index 2f2ecc134..f3911044f 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -138,7 +138,7 @@ ifneq ($(ADK_DEBUG),) ifeq ($(ADK_DEBUG_OPTS),y) TARGET_CFLAGS+= -g3 -fno-omit-frame-pointer $(ADK_TARGET_CFLAGS_OPT) else -TARGET_CFLAGS+= -g3 -fno-omit-frame-pointer +TARGET_CFLAGS+= -O0 -g3 -fno-omit-frame-pointer endif else TARGET_CPPFLAGS+= -DNDEBUG |