diff options
| author | Phil Sutter <phil@nwl.cc> | 2011-01-19 02:06:33 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-20 14:00:28 +0100 |
| commit | 801552c5a998dfd5859acdbab6db93d4e66eb550 (patch) | |
| tree | 7fa341cbdc76da6d9b4d12d4c45250f816566dab | |
| parent | d3c4a628fbee8ccda9c3500a01c7d817adbb9e4d (diff) | |
mk/image.mk: fix initramfs-piggyback for recent kernels
Newer kernels hide CONFIG_INITRAMFS_SOURCE behind the boolean
CONFIG_BLK_DEV_INITRD symbol. So replacing the further using sed may
fail since no match is found. This patch strips the config from both
symbols if existing, and appends them afterwards. I hope this does for
older kernels, too.
Signed-off-by: Phil Sutter <phil@nwl.cc>
| -rw-r--r-- | mk/image.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mk/image.mk b/mk/image.mk index 5c3d27c41..cbad4965f 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -89,8 +89,11 @@ ${BIN_DIR}/${INITRAMFS}: ${TARGET_DIR} lzma -9 >$@ 2>/dev/null ${BUILD_DIR}/${INITRAMFS_PIGGYBACK}: ${TARGET_DIR} - $(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="${BUILD_DIR}/${INITRAMFS_PIGGYBACK}"#' \ - $(LINUX_DIR)/.config + ${SED} 's/.*CONFIG_(BLK_DEV_INITRD|INITRAMFS_SOURCE).*//' \ + ${LINUX_DIR}/.config + echo "CONFIG_BLK_DEV_INITRD=y" >> ${LINUX_DIR}/.config + echo 'CONFIG_INITRAMFS_SOURCE="${BUILD_DIR}/${INITRAMFS_PIGGYBACK}"' >> \ + ${LINUX_DIR}/.config cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | \ sed "s#\(.*\)#:0:0::::::\1#" | sort | \ ${TOOLS_DIR}/cpio -o -C512 -Hnewc -P >$@ 2>/dev/null |