Rearrange cd rules to prevent bad cd dirs on build failures

This commit is contained in:
Kevin Lange 2016-12-29 14:03:14 +09:00
parent 919af62560
commit 21c4126e61

View File

@ -369,7 +369,7 @@ hdd/usr/share/terminfo/t/toaru: util/toaru.tic
FORCE:
_cdrom: FORCE
_cdrom: FORCE | ${NONTEST} toaruos-kernel
@-rm -rf _cdrom
@cp -r util/cdrom _cdrom
@ -386,12 +386,12 @@ BLACKLIST += hdd/usr/share/wallpapers/yokohama.png
BLACKLIST += hdd/usr/share/wallpapers/yosemite.png
_cdrom/ramdisk.img: ${NONTEST} hdd/usr/share/wallpapers util/devtable hdd/usr/share/terminfo/t/toaru _cdrom _cdrom/mod
@${BEG} "hdd" "Generating a ramdisk image..."
@${BEG} "ext" "Generating a ramdisk image..."
@rm -f $(filter-out ${NONTEST},${USERSPACE})
@rm -f ${BLACKLIST}
@${STRIP} ${NONTEST}
@${GENEXT} -B 4096 -d hdd -D util/devtable -U -b 16384 -N 2048 $@
@${END} "hdd" "Generated ramdisk image"
@${END} "ext" "Generated ramdisk image"
_cdrom/ramdisk.img.gz: _cdrom/ramdisk.img
@gzip $<