From: John Marino <draco@marino.st>
Date: Sun, 17 Feb 2013 19:16:53 +0000 (+0100)
Subject: build: Remove installworld backup check
X-Git-Tag: v3.4.0rc~285
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/827dd259f7cb033a5b5a0b986a270f5fe455b531

build: Remove installworld backup check

Dillon wants to rework backup functionality.
1. Remove any check that can halt installworld
2. Backup world automatically and store it in /usr/obj/world_binaries
3. Keep manual backup commands, they still it WORLD_BACKUP as before
4. Get rid of days check

This commit accomplished step 1.
---

diff --git a/Makefile.inc1 b/Makefile.inc1
index 304796a331..37b8ae07d2 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -479,16 +479,6 @@ installcheck:
 .if !defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/"
 	@case `uname -r` in 1.2*|1.3-*|1.3.*|1.4.*|1.5.0-*|1.5.1-*|1.5.2-*|1.5.3-*) echo "You must upgrade your kernel to at least 1.5.4 and reboot before you can safely installworld, due to libc/system call ABI changes" ; /usr/bin/false ; esac
 .endif
-.if !defined(NO_BACKUP)
-.  if defined(NEVER_BACKED_UP)
-	@echo "Run 'make backupworld' or set NO_BACKUP first"
-	/usr/bin/false
-.  elif defined(BACKUP_EXPIRED)
-	@echo "More than ${DAYS_BACKUP} days have passed since last backup."
-	@echo "Run 'make backupworld' or set NO_BACKUP first"
-	/usr/bin/false
-.  endif
-.endif
 #
 # installworld
 #