diff options
129 files changed, 35222 insertions, 30267 deletions
diff --git a/BSDmakefile b/BSDmakefile index 64050b550..477fc6d94 100644 --- a/BSDmakefile +++ b/BSDmakefile @@ -26,6 +26,5 @@ _subdir: ${_subdir_dep} . include "${.CURDIR}/prereq.mk" . include "${.CURDIR}/mk/split-cfg.mk" .else -. include "${.CURDIR}/prereq.mk" . include "${.CURDIR}/Makefile" .endif diff --git a/mk/image.mk b/mk/image.mk index 5b0408aa3..e80ac5d1e 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -43,7 +43,7 @@ image-prepare-post: chmod 1777 ${TARGET_DIR}/tmp INITRAMFS= ${DEVICE}-${ARCH}-${FS} -ROOTFSSQUASHFS= ${DEVICE}-${ARCH}-${FS}.fimage +ROOTFSSQUASHFS= ${DEVICE}-${ARCH}-${FS}.img ROOTFSTARBALL= ${DEVICE}-${ARCH}-${FS}.tar.gz ${BIN_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR} @@ -56,12 +56,10 @@ ${BIN_DIR}/${INITRAMFS}: ${TARGET_DIR} ${BIN_DIR}/${ROOTFSSQUASHFS}: ${TARGET_DIR} PATH='${TARGET_PATH}' \ mksquashfs ${TARGET_DIR} ${BUILD_DIR}/root.squashfs \ - -nopad -noappend -root-owned -le $(MAKE_TRACE) + -nopad -noappend -root-owned $(MAKE_TRACE) # padding of images is required cat ${BIN_DIR}/${DEVICE}-${ARCH}-kernel ${BUILD_DIR}/root.squashfs > \ ${BUILD_DIR}/${ROOTFSSQUASHFS} - dd if=${BUILD_DIR}/${ROOTFSSQUASHFS} of=${BIN_DIR}/${ROOTFSSQUASHFS} \ - bs=4063232 conv=sync $(MAKE_TRACE) imageclean: rm -f $(BIN_DIR)/$(DEVICE)-* diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index 69e271d55..04657d906 100644 --- a/mk/kernel-build.mk< |