[PATCH] module.py: replace "is" literal with "==" to make Python 3.8 happy

[Waldemar Kozaczuk]

Signed-off-by: Waldemar Kozaczuk <jwkoz...@gmail.com>
---
scripts/module.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/module.py b/scripts/module.py
index d7128388..8a1a5406 100755
--- a/scripts/module.py
+++ b/scripts/module.py
@@ -110,7 +110,7 @@ def make_cmd(cmdline, j, jobserver):
ret = 'make ' + cmdline
if jobserver is not None:
ret += ' -j --jobserver-fds=' + jobserver
- elif j is '-':
+ elif j == '-':
ret += ' -j'
elif j is not None:
ret += ' -j' + j
--
2.20.1

[Waldemar Kozaczuk]

All of the sudden gcc 10 linker has found number of duplicate
ZFS related symbols which this patch fixes:
- g_zfs
- aok
- zfsdev_state

Signed-off-by: Waldemar Kozaczuk <jwkoz...@gmail.com>
---

bsd/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h | 2 +-
bsd/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c | 2 ++
bsd/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h | 2 +-
.../contrib/opensolaris/lib/libzfs/common/libzfs_util.c | 2 --
.../contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c | 8 --------
5 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/bsd/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h b/bsd/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h
index 3ddff9e2..a56af59a 100644
--- a/bsd/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h
+++ b/bsd/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h
@@ -33,7 +33,7 @@ extern "C" {

void * safe_malloc(size_t size);
void nomem(void);
-libzfs_handle_t *g_zfs;
+extern libzfs_handle_t *g_zfs;

#ifdef __cplusplus
}
diff --git a/bsd/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c b/bsd/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
index e8073152..8ce99206 100644
--- a/bsd/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
+++ b/bsd/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
@@ -58,6 +58,8 @@

#include "statcommon.h"

+libzfs_handle_t *g_zfs;
+
static int zpool_do_create(int, char **);
static int zpool_do_destroy(int, char **);

diff --git a/bsd/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h b/bsd/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h
index 134c730f..9fd17b89 100644
--- a/bsd/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h
+++ b/bsd/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h
@@ -63,7 +63,7 @@ void pool_list_free(zpool_list_t *);
int pool_list_count(zpool_list_t *);
void pool_list_remove(zpool_list_t *, zpool_handle_t *);

-libzfs_handle_t *g_zfs;
+extern libzfs_handle_t *g_zfs;

#ifdef __cplusplus
}
diff --git a/bsd/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c b/bsd/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
index c01d8c85..54761500 100644
--- a/bsd/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
+++ b/bsd/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
@@ -55,8 +55,6 @@

#include <bsd/porting/netport.h>

-int aok;
-
int
libzfs_errno(libzfs_handle_t *hdl)
{
diff --git a/bsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c b/bsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
index 7dbaa5ba..c2d500ce 100644
--- a/bsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
+++ b/bsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
@@ -5248,14 +5248,6 @@ pool_status_check(const char *name, zfs_ioc_namecheck_t type)
return (error);
}

-#ifdef __OSV__
-
-// really from zvol.c, but we don't build that yet
-void *zfsdev_state;
-
-#endif
-
-
/*
* Find a free minor number.
*/
--
2.20.1

[Waldek Kozaczuk]

This one makes OSv compile, link and boot with older versions of gcc. It also makes OSv compile and link with gcc 10 (but does not boot yet for other reasons).

[Commit Bot]

From: Waldemar Kozaczuk <jwkoz...@gmail.com>
Committer: Waldemar Kozaczuk <jwkoz...@gmail.com>
Branch: master

module.py: replace "is" literal with "==" to make Python 3.8 happy

Signed-off-by: Waldemar Kozaczuk <jwkoz...@gmail.com>

---

diff --git a/scripts/module.py b/scripts/module.py

[Commit Bot]

From: Waldemar Kozaczuk <jwkoz...@gmail.com>
Committer: Waldemar Kozaczuk <jwkoz...@gmail.com>
Branch: master

gcc 10: fix duplicate linker symbol errors

All of the sudden gcc 10 linker has found number of duplicate
ZFS related symbols which this patch fixes:
- g_zfs
- aok
- zfsdev_state

Signed-off-by: Waldemar Kozaczuk <jwkoz...@gmail.com>

---

diff --git a/bsd/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h b/bsd/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h

--- a/bsd/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h
+++ b/bsd/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h
@@ -33,7 +33,7 @@ extern "C" {

void * safe_malloc(size_t size);
void nomem(void);
-libzfs_handle_t *g_zfs;
+extern libzfs_handle_t *g_zfs;

#ifdef __cplusplus
}
diff --git a/bsd/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c b/bsd/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c

--- a/bsd/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
+++ b/bsd/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
@@ -58,6 +58,8 @@

#include "statcommon.h"

+libzfs_handle_t *g_zfs;
+
static int zpool_do_create(int, char **);
static int zpool_do_destroy(int, char **);

diff --git a/bsd/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h b/bsd/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h

--- a/bsd/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h
+++ b/bsd/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h
@@ -63,7 +63,7 @@ void pool_list_free(zpool_list_t *);
int pool_list_count(zpool_list_t *);
void pool_list_remove(zpool_list_t *, zpool_handle_t *);

-libzfs_handle_t *g_zfs;
+extern libzfs_handle_t *g_zfs;

#ifdef __cplusplus
}
diff --git a/bsd/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c b/bsd/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c

--- a/bsd/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
+++ b/bsd/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
@@ -55,8 +55,6 @@

#include <bsd/porting/netport.h>

-int aok;
-
int
libzfs_errno(libzfs_handle_t *hdl)
{
diff --git a/bsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c b/bsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c