Merge branch 'dde-upstream' into dde

6 files changed, 26 insertions, 121 deletions

diff --git a/dde_e100/Makeconf.local b/dde_e100/Makeconf.local
index 074df6e0..fb8e6ae6 100644
--- a/dde_e100/Makeconf.local
+++ b/dde_e100/Makeconf.local
@@ -2,31 +2,12 @@ SYSTEMS = x86-l4v2
 ARCH = x86
 SYSTEM = x86-l4v2
 
-BUILDDIR       ?= 
+BUILDDIR       ?= ..
 
-libmachdev_path := ../libmachdev/libmachdev.a
-has_libmachdev := $(wildcard $(libmachdev_path))
-ifeq ($(strip $(has_libmachdev)),)
-  libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a
-endif
-
-libddekit_path := ../libddekit/libddekit.a
-has_libddekit := $(wildcard $(libddekit_path))
-ifeq ($(strip $(has_libddekit)),)
-  libddekit_path := $(BUILDDIR)/libddekit/libddekit.a
-endif
-
-libslab_path := ../libhurd-slab/libhurd-slab.a
-has_libslab := $(wildcard $(libslab_path))
-ifeq ($(strip $(has_libslab)),)
-  libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a
-endif
-
-libbpf_path := ../libbpf/libbpf.a
-has_libbpf := $(wildcard $(libbpf_path))
-ifeq ($(strip $(has_libbpf)),)
-  libbpf_path := $(BUILDDIR)/libbpf/libbpf.a
-endif
+libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a
+libddekit_path := $(BUILDDIR)/libddekit/libddekit.a
+libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a
+libbpf_path := $(BUILDDIR)/libbpf/libbpf.a
 
 DDEKITLIBDIR = $(PKGDIR)/../libddekit/
 DDEKITINCDIR = $(PKGDIR)/../libddekit/include
diff --git a/dde_e1000/Makeconf.local b/dde_e1000/Makeconf.local
index 44f70ab8..fb8e6ae6 100644
--- a/dde_e1000/Makeconf.local
+++ b/dde_e1000/Makeconf.local
@@ -2,31 +2,12 @@ SYSTEMS = x86-l4v2
 ARCH = x86
 SYSTEM = x86-l4v2
 
-BUILDDIR       ?=
+BUILDDIR       ?= ..
 
-libmachdev_path := ../libmachdev/libmachdev.a
-has_libmachdev := $(wildcard $(libmachdev_path))
-ifeq ($(strip $(has_libmachdev)),)
-  libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a
-endif
-
-libddekit_path := ../libddekit/libddekit.a
-has_libddekit := $(wildcard $(libddekit_path))
-ifeq ($(strip $(has_libddekit)),)
-  libddekit_path := $(BUILDDIR)/libddekit/libddekit.a
-endif
-
-libslab_path := ../libhurd-slab/libhurd-slab.a
-has_libslab := $(wildcard $(libslab_path))
-ifeq ($(strip $(has_libslab)),)
-  libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a
-endif
-
-libbpf_path := ../libbpf/libbpf.a
-has_libbpf := $(wildcard $(libbpf_path))
-ifeq ($(strip $(has_libbpf)),)
-  libbpf_path := $(BUILDDIR)/libbpf/libbpf.a
-endif
+libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a
+libddekit_path := $(BUILDDIR)/libddekit/libddekit.a
+libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a
+libbpf_path := $(BUILDDIR)/libbpf/libbpf.a
 
 DDEKITLIBDIR = $(PKGDIR)/../libddekit/
 DDEKITINCDIR = $(PKGDIR)/../libddekit/include
diff --git a/dde_ne2k_pci/Makeconf.local b/dde_ne2k_pci/Makeconf.local
index 44f70ab8..fb8e6ae6 100644
--- a/dde_ne2k_pci/Makeconf.local
+++ b/dde_ne2k_pci/Makeconf.local
@@ -2,31 +2,12 @@ SYSTEMS = x86-l4v2
 ARCH = x86
 SYSTEM = x86-l4v2
 
-BUILDDIR       ?=
+BUILDDIR       ?= ..
 
-libmachdev_path := ../libmachdev/libmachdev.a
-has_libmachdev := $(wildcard $(libmachdev_path))
-ifeq ($(strip $(has_libmachdev)),)
-  libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a
-endif
-
-libddekit_path := ../libddekit/libddekit.a
-has_libddekit := $(wildcard $(libddekit_path))
-ifeq ($(strip $(has_libddekit)),)
-  libddekit_path := $(BUILDDIR)/libddekit/libddekit.a
-endif
-
-libslab_path := ../libhurd-slab/libhurd-slab.a
-has_libslab := $(wildcard $(libslab_path))
-ifeq ($(strip $(has_libslab)),)
-  libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a
-endif
-
-libbpf_path := ../libbpf/libbpf.a
-has_libbpf := $(wildcard $(libbpf_path))
-ifeq ($(strip $(has_libbpf)),)
-  libbpf_path := $(BUILDDIR)/libbpf/libbpf.a
-endif
+libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a
+libddekit_path := $(BUILDDIR)/libddekit/libddekit.a
+libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a
+libbpf_path := $(BUILDDIR)/libbpf/libbpf.a
 
 DDEKITLIBDIR = $(PKGDIR)/../libddekit/
 DDEKITINCDIR = $(PKGDIR)/../libddekit/include
diff --git a/dde_pcnet32/Makeconf.local b/dde_pcnet32/Makeconf.local
index 44f70ab8..fb8e6ae6 100644
--- a/dde_pcnet32/Makeconf.local
+++ b/dde_pcnet32/Makeconf.local
@@ -2,31 +2,12 @@ SYSTEMS = x86-l4v2
 ARCH = x86
 SYSTEM = x86-l4v2
 
-BUILDDIR       ?=
+BUILDDIR       ?= ..
 
-libmachdev_path := ../libmachdev/libmachdev.a
-has_libmachdev := $(wildcard $(libmachdev_path))
-ifeq ($(strip $(has_libmachdev)),)
-  libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a
-endif
-
-libddekit_path := ../libddekit/libddekit.a
-has_libddekit := $(wildcard $(libddekit_path))
-ifeq ($(strip $(has_libddekit)),)
-  libddekit_path := $(BUILDDIR)/libddekit/libddekit.a
-endif
-
-libslab_path := ../libhurd-slab/libhurd-slab.a
-has_libslab := $(wildcard $(libslab_path))
-ifeq ($(strip $(has_libslab)),)
-  libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a
-endif
-
-libbpf_path := ../libbpf/libbpf.a
-has_libbpf := $(wildcard $(libbpf_path))
-ifeq ($(strip $(has_libbpf)),)
-  libbpf_path := $(BUILDDIR)/libbpf/libbpf.a
-endif
+libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a
+libddekit_path := $(BUILDDIR)/libddekit/libddekit.a
+libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a
+libbpf_path := $(BUILDDIR)/libbpf/libbpf.a
 
 DDEKITLIBDIR = $(PKGDIR)/../libddekit/
 DDEKITINCDIR = $(PKGDIR)/../libddekit/include
diff --git a/dde_rtl8139/Makeconf.local b/dde_rtl8139/Makeconf.local
index 44f70ab8..fb8e6ae6 100644
--- a/dde_rtl8139/Makeconf.local
+++ b/dde_rtl8139/Makeconf.local
@@ -2,31 +2,12 @@ SYSTEMS = x86-l4v2
 ARCH = x86
 SYSTEM = x86-l4v2
 
-BUILDDIR       ?=
+BUILDDIR       ?= ..
 
-libmachdev_path := ../libmachdev/libmachdev.a
-has_libmachdev := $(wildcard $(libmachdev_path))
-ifeq ($(strip $(has_libmachdev)),)
-  libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a
-endif
-
-libddekit_path := ../libddekit/libddekit.a
-has_libddekit := $(wildcard $(libddekit_path))
-ifeq ($(strip $(has_libddekit)),)
-  libddekit_path := $(BUILDDIR)/libddekit/libddekit.a
-endif
-
-libslab_path := ../libhurd-slab/libhurd-slab.a
-has_libslab := $(wildcard $(libslab_path))
-ifeq ($(strip $(has_libslab)),)
-  libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a
-endif
-
-libbpf_path := ../libbpf/libbpf.a
-has_libbpf := $(wildcard $(libbpf_path))
-ifeq ($(strip $(has_libbpf)),)
-  libbpf_path := $(BUILDDIR)/libbpf/libbpf.a
-endif
+libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a
+libddekit_path := $(BUILDDIR)/libddekit/libddekit.a
+libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a
+libbpf_path := $(BUILDDIR)/libbpf/libbpf.a
 
 DDEKITLIBDIR = $(PKGDIR)/../libddekit/
 DDEKITINCDIR = $(PKGDIR)/../libddekit/include
diff --git a/devnode/devnode.c b/devnode/devnode.c
index 299de3c3..50011aa4 100644
--- a/devnode/devnode.c
+++ b/devnode/devnode.c
@@ -255,7 +255,7 @@ trivfs_append_args (struct trivfs_control *fsys, char **argz, size_t *argz_len)
   if (master_file)
     ADD_OPT ("--master-device=%s", master_file);
 
-  ADD_OPT (device_name);
+  ADD_OPT ("%s", device_name);
 
 #undef ADD_OPT
   return err;