From 21c4126e6132cb733e589d8e9504e448bd78f57e Mon Sep 17 00:00:00 2001 From: Kevin Lange Date: Thu, 29 Dec 2016 14:03:14 +0900 Subject: [PATCH] Rearrange cd rules to prevent bad cd dirs on build failures --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5348aefb..37000daf 100644 --- a/Makefile +++ b/Makefile @@ -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 $<