summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/conf/Makefile.alpha11
-rw-r--r--sys/conf/Makefile.i38611
-rw-r--r--sys/conf/Makefile.ia6411
-rw-r--r--sys/conf/Makefile.pc9811
-rw-r--r--sys/conf/Makefile.powerpc11
-rw-r--r--sys/conf/kmod.mk2
6 files changed, 11 insertions, 46 deletions
diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index ddeae04..0d6afd1 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -292,23 +292,16 @@ kernel-install kernel-install.debug:
fi
.if exists(${DESTDIR}${KODIR})
.if exists(${DESTDIR}${KODIR}.old)
- @-chflags -R noschg ${DESTDIR}${KODIR}.old
-rm -rf ${DESTDIR}${KODIR}.old
.endif
mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old
.endif
mkdir -p ${DESTDIR}${KODIR}
- @-if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \
- chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \
- fi
- install -c -m 555 -o root -g wheel -fschg \
+ install -c -m 555 -o root -g wheel \
${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}${KODIR}
kernel-reinstall kernel-reinstall.debug:
- @-if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \
- chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \
- fi
- install -c -m 555 -o root -g wheel -fschg \
+ install -c -m 555 -o root -g wheel \
${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}${KODIR}
.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules)
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 69ca923..1d5e1dc 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -252,23 +252,16 @@ kernel-install kernel-install.debug:
fi
.if exists(${DESTDIR}${KODIR})
.if exists(${DESTDIR}${KODIR}.old)
- @-chflags -R noschg ${DESTDIR}${KODIR}.old
-rm -rf ${DESTDIR}${KODIR}.old
.endif
mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old
.endif
mkdir -p ${DESTDIR}${KODIR}
- @-if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \
- chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \
- fi
- install -c -m 555 -o root -g wheel -fschg \
+ install -c -m 555 -o root -g wheel \
${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}${KODIR}
kernel-reinstall kernel-reinstall.debug:
- @-if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \
- chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \
- fi
- install -c -m 555 -o root -g wheel -fschg \
+ install -c -m 555 -o root -g wheel \
${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}${KODIR}
.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules)
diff --git a/sys/conf/Makefile.ia64 b/sys/conf/Makefile.ia64
index bb0151b..a589b00 100644
--- a/sys/conf/Makefile.ia64
+++ b/sys/conf/Makefile.ia64
@@ -256,23 +256,16 @@ kernel-install kernel-install.debug:
fi
.if exists(${DESTDIR}${KODIR})
.if exists(${DESTDIR}${KODIR}.old)
- @-chflags -R noschg ${DESTDIR}${KODIR}.old
-rm -rf ${DESTDIR}${KODIR}.old
.endif
mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old
.endif
mkdir -p ${DESTDIR}${KODIR}
- @-if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \
- chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \
- fi
- install -c -m 555 -o root -g wheel -fschg \
+ install -c -m 555 -o root -g wheel \
${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}${KODIR}
kernel-reinstall kernel-reinstall.debug:
- @-if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \
- chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \
- fi
- install -c -m 555 -o root -g wheel -fschg \
+ install -c -m 555 -o root -g wheel \
${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}${KODIR}
.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules)
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index d132d3e..bce1d59 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -255,23 +255,16 @@ kernel-install kernel-install.debug:
fi
.if exists(${DESTDIR}${KODIR})
.if exists(${DESTDIR}${KODIR}.old)
- @-chflags -R noschg ${DESTDIR}${KODIR}.old
-rm -rf ${DESTDIR}${KODIR}.old
.endif
mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old
.endif
mkdir -p ${DESTDIR}${KODIR}
- @-if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \
- chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \
- fi
- install -c -m 555 -o root -g wheel -fschg \
+ install -c -m 555 -o root -g wheel \
${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}${KODIR}
kernel-reinstall kernel-reinstall.debug:
- @-if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \
- chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \
- fi
- install -c -m 555 -o root -g wheel -fschg \
+ install -c -m 555 -o root -g wheel \
${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}${KODIR}
.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules)
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 69ca923..1d5e1dc 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -252,23 +252,16 @@ kernel-install kernel-install.debug:
fi
.if exists(${DESTDIR}${KODIR})
.if exists(${DESTDIR}${KODIR}.old)
- @-chflags -R noschg ${DESTDIR}${KODIR}.old
-rm -rf ${DESTDIR}${KODIR}.old
.endif
mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old
.endif
mkdir -p ${DESTDIR}${KODIR}
- @-if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \
- chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \
- fi
- install -c -m 555 -o root -g wheel -fschg \
+ install -c -m 555 -o root -g wheel \
${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}${KODIR}
kernel-reinstall kernel-reinstall.debug:
- @-if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \
- chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \
- fi
- install -c -m 555 -o root -g wheel -fschg \
+ install -c -m 555 -o root -g wheel \
${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}${KODIR}
.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules)
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 7a279f3..7b1f7c8 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -205,7 +205,7 @@ beforeinstall:
afterinstall:
.endif
-_INSTALLFLAGS:= -fschg ${INSTALLFLAGS}
+_INSTALLFLAGS:= ${INSTALLFLAGS}
.for ie in ${INSTALLFLAGS_EDIT}
_INSTALLFLAGS:= ${_INSTALLFLAGS${ie}}
.endfor
OpenPOWER on IntegriCloud