diff options
| -rw-r--r-- | mk/image.mk | 4 | ||||
| -rw-r--r-- | mk/vars.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mk/image.mk b/mk/image.mk index e97839760..6721549b5 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -47,7 +47,7 @@ image-prepare-post: mkfontdir ${TARGET_DIR}/usr/share/fonts/X11/$${i}; \ done; \ fi - sed -i '/^root:/s!:/bin/sh$$!:${ROOTSH}!' ${TARGET_DIR}/etc/passwd + $(SED) '/^root:/s!:/bin/sh$$!:${ROOTSH}!' ${TARGET_DIR}/etc/passwd -rm -f ${TARGET_DIR}/bin/sh ln -sf ${BINSH} ${TARGET_DIR}/bin/sh ifeq ($(ADK_LINUX_X86_64),y) @@ -171,7 +171,7 @@ ${FW_DIR}/${ROOTFSJFFS2}: ${TARGET_DIR} --pad=$(ADK_TARGET_MTD_SIZE) -o ${FW_DIR}/${ROOTFSJFFS2} $(MAKE_TRACE) createinitramfs: ${STAGING_TARGET_DIR}/${INITRAMFS}_list - ${SED} 's/.*CONFIG_(BLK_DEV_INITRD|INITRAMFS_SOURCE|INITRAMFS_COMPRESSION).*//' \ + ${SED} 's/.*CONFIG_\(RD_\|XZ_\|BLK_DEV_INITRD\|INITRAMFS_\).*//' \ ${LINUX_DIR}/.config ( \ echo "CONFIG_BLK_DEV_INITRD=y"; \ diff --git a/mk/vars.mk b/mk/vars.mk index c497feb9a..34c9c90e2 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -145,9 +145,9 @@ LDFLAGS_FOR_BUILD?= -L$(STAGING_HOST_DIR)/usr/lib FLAGS_FOR_BUILD= ${CPPFLAGS_FOR_BUILD} ${CFLAGS_FOR_BUILD} ${LDFLAGS_FOR_BUILD} PATCH= ${BASH} $(SCRIPT_DIR)/patch.sh -SED:= sed -i -e +SED:= PATH=${HOST_PATH} sed -i -e LINUX_DIR:= $(BUILD_DIR)/linux -KERNEL_MODULE_FLAGS:= ARCH=${ARCH} KERNELVERSION="2.6" \ +KERNEL_MODULE_FLAGS:= ARCH=${ARCH} \ KERNEL_PATH=${LINUX_DIR} KERNELDIR=${LINUX_DIR} KERNEL_DIR=${LINUX_DIR} \ PREFIX=/usr CROSS_COMPILE="${TARGET_CROSS}" \ LDFLAGS="$(ADK_TARGET_KERNEL_LDFLAGS)" CFLAGS_MODULE="-fhonour-copts" V=1 |