initrd: Fix installation during make release

Operating Systems / DragonFlyBSD - François Tigeot [wolfpond.org] - 16 April 2014 03:54 UTC

- mkinitrd needs to know ramdisk images are to be installed in ${DESTDIR}/boot/kernel and not just /boot/kernel

- ${DESTDIR}/boot/kernel also has to exist first. Create it with mtree(8)

###

diff --git a/Makefile.inc1 b/Makefile.inc1
index 2eb89bf..860362c 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -486,7 +486,7 @@ installworld: installcheck

cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}
${INSTALL} -o root -g wheel -m 644 ${.CURDIR}/Makefile_upgrade.inc ${DESTDIR}/etc/upgrade/
- mkinitrd
+ mkinitrd -b ${DESTDIR}/boot

#
# reinstall
diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index ba5fa97..3a0364a 100644
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -10,6 +10,8 @@
boot
defaults
..
+ kernel
+ ..
..
compat
ndis

a93ddcb initrd: Fix installation during make release
Makefile.inc1 | 2 +-
etc/mtree/BSD.root.dist | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)

Upstream: gitweb.dragonflybsd.org

  • Share