[Pkg-virtualbox-commits] [kbuild] 02/05: New upstream version 0.1.9998svn3103+dfsg

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg pushed a commit to branch master
in repository kbuild.

commit a1f8dd399347952de2ca5a8b91d66f258946483b
Author: Gianfranco Costamagna <locutusofborg at debian.org>
Date:   Fri Oct 20 15:46:46 2017 +0200

    New upstream version 0.1.9998svn3103+dfsg
---
 kBuild/env.sh                |  9 ++++++++-
 kBuild/header.kmk            | 10 +++++-----
 src/kmk/kmkbuiltin/install.c |  3 ++-
 src/kmk/kmkbuiltin/rm.c      |  3 ++-
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/kBuild/env.sh b/kBuild/env.sh
index 83590ef..468bf3e 100755
--- a/kBuild/env.sh
+++ b/kBuild/env.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: env.sh 3099 2017-10-20 09:49:02Z bird $
+# $Id: env.sh 3103 2017-10-20 13:13:54Z bird $
 ## @file
 # Environment setup script.
 #
@@ -264,6 +264,10 @@ if test -z "$KBUILD_HOST"; then
             KBUILD_HOST=freebsd
             ;;
 
+        GNU)
+            KBUILD_HOST=gnuhurd
+            ;;
+
         GNU/kFreeBSD)
             KBUILD_HOST=gnukfbsd
             ;;
@@ -361,6 +365,9 @@ if test -z "$KBUILD_HOST_ARCH"; then
         ppc64|ppc64le|powerpc64|powerpc64le)
             KBUILD_HOST_ARCH='ppc64'
             ;;
+        m68k)
+            KBUILD_HOST_ARCH='m68k'
+            ;;
         mips32|mips)
             KBUILD_HOST_ARCH='mips32'
             ;;
diff --git a/kBuild/header.kmk b/kBuild/header.kmk
index 648a03f..8681f05 100644
--- a/kBuild/header.kmk
+++ b/kBuild/header.kmk
@@ -1,4 +1,4 @@
-# $Id: header.kmk 3093 2017-10-13 13:07:39Z bird $
+# $Id: header.kmk 3103 2017-10-20 13:13:54Z bird $
 ## @file
 # kBuild - File included at top of a makefile.
 #
@@ -79,7 +79,7 @@ endif
 # The revision in which this file was last modified.
 # This can be useful when using development versions of kBuild.
 #
-KMK_REVISION := $(patsubst %:,,  $Rev: 3093 $  )
+KMK_REVISION := $(patsubst %:,,  $Rev: 3103 $  )
 
 
 #
@@ -196,10 +196,10 @@ KBUILD_BLD_TYPES := release profile debug
 # this keyword namespace is shared between OSes, architectures, cpus and
 # build types. (PORTME)
 #
-KBUILD_OSES      := darwin dos dragonfly freebsd gnukfbsd gnuknbsd haiku l4 linux netbsd nt openbsd os2 solaris win os-agnostic
-KBUILD_ARCHES    := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 mips32 mips64 ppc32 ppc64 s390 s390x sh32 sh64 sparc32 sparc64
+KBUILD_OSES      := darwin dos dragonfly freebsd gnuhurd gnukfbsd gnuknbsd haiku l4 linux netbsd nt openbsd os2 solaris win os-agnostic
+KBUILD_ARCHES    := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k mips32 mips64 ppc32 ppc64 s390 s390x sh32 sh64 sparc32 sparc64
 KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 mips64 ppc64 s390x sh64 sparc64
-KBUILD_ARCHES_32 := x86 arm32 hppa32 mips32 ppc32 s390 sh32 sparc32
+KBUILD_ARCHES_32 := x86 arm32 hppa32 m68k mips32 ppc32 s390 sh32 sparc32
 
 
 
diff --git a/src/kmk/kmkbuiltin/install.c b/src/kmk/kmkbuiltin/install.c
index afccab1..c102daa 100644
--- a/src/kmk/kmkbuiltin/install.c
+++ b/src/kmk/kmkbuiltin/install.c
@@ -92,6 +92,7 @@ __FBSDID("$FreeBSD: src/usr.bin/xinstall/xinstall.c,v 1.66 2005/01/25 14:34:57 s
 # include "haikufakes.h"
 #endif
 #include "kmkbuiltin.h"
+#include "k/kDefs.h"	/* for K_OS */
 
 
 extern void * bsd_setmode(const char *p);
@@ -213,7 +214,7 @@ kmk_builtin_install(int argc, char *argv[], char ** envp)
 			dodir = 1;
 			break;
 		case 'f':
-#ifdef UF_IMMUTABLE
+#if defined(UF_IMMUTABLE) && K_OS != K_OS_GNU_KFBSD
 			flags = optarg;
 			if (strtofflags(&flags, &fset, NULL))
 				return errx(EX_USAGE, "%s: invalid flag", flags);
diff --git a/src/kmk/kmkbuiltin/rm.c b/src/kmk/kmkbuiltin/rm.c
index afa57e1..b019968 100644
--- a/src/kmk/kmkbuiltin/rm.c
+++ b/src/kmk/kmkbuiltin/rm.c
@@ -85,6 +85,7 @@ static char sccsid[] = "@(#)rm.c	8.5 (Berkeley) 4/18/94";
 #endif
 #include "kmkbuiltin.h"
 #include "kbuild_protection.h"
+#include "k/kDefs.h"	/* for K_OS */
 
 #if defined(__EMX__) || defined(KBUILD_OS_WINDOWS)
 # define IS_SLASH(ch)   ( (ch) == '/' || (ch) == '\\' )
@@ -679,7 +680,7 @@ check(char *path, char *name, struct stat *sp)
                     )
 			return (1);
 		bsd_strmode(sp->st_mode, modep);
-#ifdef SF_APPEND
+#if defined(SF_APPEND) && K_OS != K_OS_GNU_KFBSD
 		if ((flagsp = fflagstostr(sp->st_flags)) == NULL)
 			exit(err(1, "fflagstostr"));
 		(void)fprintf(stderr, "override %s%s%s/%s %s%sfor %s? ",

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/kbuild.git