diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-08 17:45:36 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-08 17:45:36 +0100 |
| commit | b75415ddb0d10eb98fe3d225db9cd800f6f8b91b (patch) | |
| tree | 7ccbde024597cf828b91d0ec5fb2b221a2bd5fe6 /mk/image.mk | |
| parent | f23350e6545366c1383656be1d77023746970dc4 (diff) | |
| parent | ad914ac4ab920f491ac635eb85bd387bb781fd95 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk/image.mk')
| -rw-r--r-- | mk/image.mk | 4 |
1 files changed, 2 insertions, 2 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"; \ |