diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-31 16:48:45 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-31 16:48:45 +0100 |
| commit | 38136c7702e1940a88f24d09141f07b23b966a1c (patch) | |
| tree | b1ba1e95441ce11b8ed84dc3810c7481df26ef92 /mk | |
| parent | 50e7ffe10d0bca1ef5b2d27ebc518b456035a18d (diff) | |
| parent | 2dce122bacb8837543ff8e882a1df7284324e357 (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 484b2745a..3b1db46cd 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -69,7 +69,7 @@ ${BIN_DIR}/${ROOTFSSQUASHFS}: ${TARGET_DIR} ${STAGING_HOST_DIR}/bin/mksquashfs ${TARGET_DIR} \ ${BUILD_DIR}/root.squashfs \ -nopad -noappend -root-owned $(MAKE_TRACE) - cat ${ADK_TARGET_KERNEL} ${BUILD_DIR}/root.squashfs > \ + cat ${TARGET_KERNEL} ${BUILD_DIR}/root.squashfs > \ ${BUILD_DIR}/${ROOTFSSQUASHFS} createinitramfs: |