From f6b98dc603ace357226937fa35f313367c9351f5 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sun, 5 Dec 2010 03:14:10 +0000 Subject: [PATCH] Fixed images creation on NetBSD --- targets/NetBSD | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/targets/NetBSD b/targets/NetBSD index c5f6fe0..bc468e8 100644 --- a/targets/NetBSD +++ b/targets/NetBSD @@ -48,10 +48,10 @@ _image_image() $SUDO $MBRLABEL -frw "$VND" && $SUDO $MKFS "${VND}e" && $SUDO $MOUNT "/dev/${VND}e" "$DESTDIR" && - $SUDO $MKDIR "$DESTDIR$PREFIX" && - $SUDO $CHOWN "$UID:$GID" "$DESTDIR$PREFIX" && - target "install" && - $SUDO $CHOWN -R "0:0" "$DESTDIR$PREFIX" && + $SUDO $CHOWN "$UID:$GID" "$DESTDIR" && + $MKDIR "$DESTDIR$PREFIX" && + _image_targets && + $SUDO $CHOWN -R "0:0" "$DESTDIR" && $SUDO $MKDIR "$DESTDIR/bin" && $SUDO $MV "$DESTDIR$PREFIX/bin/sh" "$DESTDIR/bin/sh" && $SUDO $MKDIR "$DESTDIR/dev" && @@ -116,3 +116,39 @@ _image_iso() $INSTALLBOOT -m "$MACHINE" -o "console=pc" -e bootxx || exit 2 $MKISOFS $MKISOFS_ARGS "$IMAGE_FILE" "$DESTDIR" || exit 2 } + + +#image_targets +_image_targets() +{ + #global settings + CPPFLAGS="-nostdinc -isystem $DESTDIR$PREFIX/include" + CFLAGS="-Wall -ffreestanding -g" + + #libc + LDFLAGS="-nostdlib -L$DESTDIR$PREFIX/lib -Wl,-rpath-link,$DESTDIR$PREFIX/lib -Wl,-rpath,$PREFIX/lib" + SUBDIRS="System/src/libc" + target install || return 2 + + #libSystem + LDFLAGS="-nostdlib -L$DESTDIR$PREFIX/lib -Wl,-rpath-link,$DESTDIR$PREFIX/lib -Wl,-rpath,$PREFIX/lib -lc" + SUBDIRS="System/src/libSystem/src System/src/libSystem/include" + target install || return 2 + LDFLAGS="-nostdlib -L$DESTDIR$PREFIX/lib -Wl,-rpath-link,$DESTDIR$PREFIX/lib -Wl,-rpath,$PREFIX/lib -lc `$CC -print-libgcc-file-name` $DESTDIR$PREFIX/lib/start.o" + SUBDIRS="System/src/libSystem/tools" + target install || return 2 + + #POSIX environment + SUBDIRS="Apps/Unix/src/sh + Apps/Unix/src/utils + Apps/Unix/src/devel + Apps/Unix/src/others + Apps/Servers/src/inetd" + target install || return 2 + + #DeforaOS environment + SUBDIRS="System/src/Init + System/src/Splasher + System/src/VFS/src" + target install || return 2 +}