diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-02 19:50:47 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-02 19:50:47 +0200 |
| commit | 6f96b57ffa30d8e1bf6af9d1e9fae1902cb419e1 (patch) | |
| tree | 4ae705ebc844f4fc08e34e92af689cdb76475423 /mk | |
| parent | b7bbd7b3cf2d9f774464953fd2c42be9cabe790c (diff) | |
| parent | 64d1148c48e3cd428da42a5eb9bcda50f08171fb (diff) | |
resolve conflict
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/image.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mk/image.mk b/mk/image.mk index 185164c22..78b18e716 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -95,7 +95,7 @@ ${BIN_DIR}/${INITRAMFS}: ${TARGET_DIR} cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | \ sed "s#\(.*\)#:0:0::::::\1#" | sort | \ ${TOOLS_DIR}/cpio -o -C512 -Hnewc -P | \ - lzma -9 >$@ 2>/dev/null + xz -C crc32 >$@ 2>/dev/null ${BUILD_DIR}/${INITRAMFS_PIGGYBACK}: ${TARGET_DIR} ${SED} 's/.*CONFIG_(BLK_DEV_INITRD|INITRAMFS_SOURCE).*//' \ |