From 8c81ab52c0bc8aecf65f178fd9b9511e20850972 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 19 Feb 2012 12:37:06 +0000 Subject: Fix format security --- devnode/devnode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- cgit v1.2.3 From 5389b476b0c88d1555186fb8f4e68a5bc198d348 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 19 Feb 2012 13:01:53 +0000 Subject: Simplify link flags computation --- dde_e100/Makeconf.local | 29 +++++------------------------ dde_e1000/Makeconf.local | 29 +++++------------------------ dde_ne2k_pci/Makeconf.local | 29 +++++------------------------ dde_pcnet32/Makeconf.local | 29 +++++------------------------ dde_rtl8139/Makeconf.local | 29 +++++------------------------ 5 files changed, 25 insertions(+), 120 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 -- cgit v1.2.3 From 32ca6f4795c6f4ac107cdd315f1d2bafb00a7c02 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 19 Feb 2012 13:13:48 +0000 Subject: Dynamically link against libddekit, libhurd-slab and libbpf --- dde_e100/Makeconf.local | 6 +++--- dde_e1000/Makeconf.local | 6 +++--- dde_ne2k_pci/Makeconf.local | 6 +++--- dde_pcnet32/Makeconf.local | 6 +++--- dde_rtl8139/Makeconf.local | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dde_e100/Makeconf.local b/dde_e100/Makeconf.local index fb8e6ae6..6a2da817 100644 --- a/dde_e100/Makeconf.local +++ b/dde_e100/Makeconf.local @@ -5,9 +5,9 @@ SYSTEM = x86-l4v2 BUILDDIR ?= .. 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 +libddekit_path := -L$(BUILDDIR)/libddekit -lddekit +libslab_path := -L$(BUILDDIR)/libhurd-slab -lhurd-slab +libbpf_path := -L$(BUILDDIR)/libbpf -lbpf DDEKITLIBDIR = $(PKGDIR)/../libddekit/ DDEKITINCDIR = $(PKGDIR)/../libddekit/include diff --git a/dde_e1000/Makeconf.local b/dde_e1000/Makeconf.local index fb8e6ae6..6a2da817 100644 --- a/dde_e1000/Makeconf.local +++ b/dde_e1000/Makeconf.local @@ -5,9 +5,9 @@ SYSTEM = x86-l4v2 BUILDDIR ?= .. 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 +libddekit_path := -L$(BUILDDIR)/libddekit -lddekit +libslab_path := -L$(BUILDDIR)/libhurd-slab -lhurd-slab +libbpf_path := -L$(BUILDDIR)/libbpf -lbpf DDEKITLIBDIR = $(PKGDIR)/../libddekit/ DDEKITINCDIR = $(PKGDIR)/../libddekit/include diff --git a/dde_ne2k_pci/Makeconf.local b/dde_ne2k_pci/Makeconf.local index fb8e6ae6..6a2da817 100644 --- a/dde_ne2k_pci/Makeconf.local +++ b/dde_ne2k_pci/Makeconf.local @@ -5,9 +5,9 @@ SYSTEM = x86-l4v2 BUILDDIR ?= .. 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 +libddekit_path := -L$(BUILDDIR)/libddekit -lddekit +libslab_path := -L$(BUILDDIR)/libhurd-slab -lhurd-slab +libbpf_path := -L$(BUILDDIR)/libbpf -lbpf DDEKITLIBDIR = $(PKGDIR)/../libddekit/ DDEKITINCDIR = $(PKGDIR)/../libddekit/include diff --git a/dde_pcnet32/Makeconf.local b/dde_pcnet32/Makeconf.local index fb8e6ae6..6a2da817 100644 --- a/dde_pcnet32/Makeconf.local +++ b/dde_pcnet32/Makeconf.local @@ -5,9 +5,9 @@ SYSTEM = x86-l4v2 BUILDDIR ?= .. 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 +libddekit_path := -L$(BUILDDIR)/libddekit -lddekit +libslab_path := -L$(BUILDDIR)/libhurd-slab -lhurd-slab +libbpf_path := -L$(BUILDDIR)/libbpf -lbpf DDEKITLIBDIR = $(PKGDIR)/../libddekit/ DDEKITINCDIR = $(PKGDIR)/../libddekit/include diff --git a/dde_rtl8139/Makeconf.local b/dde_rtl8139/Makeconf.local index fb8e6ae6..6a2da817 100644 --- a/dde_rtl8139/Makeconf.local +++ b/dde_rtl8139/Makeconf.local @@ -5,9 +5,9 @@ SYSTEM = x86-l4v2 BUILDDIR ?= .. 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 +libddekit_path := -L$(BUILDDIR)/libddekit -lddekit +libslab_path := -L$(BUILDDIR)/libhurd-slab -lhurd-slab +libbpf_path := -L$(BUILDDIR)/libbpf -lbpf DDEKITLIBDIR = $(PKGDIR)/../libddekit/ DDEKITINCDIR = $(PKGDIR)/../libddekit/include -- cgit v1.2.3 From c33d6ed786cdb46310dcb2a80056062d978759d0 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 19 Feb 2012 14:17:02 +0000 Subject: Fix ddekit initialization. Shared linking makes initcall fail --- dde_e100/Makeconf.local | 2 +- dde_e1000/Makeconf.local | 2 +- dde_ne2k_pci/Makeconf.local | 2 +- dde_pcnet32/Makeconf.local | 2 +- dde_rtl8139/Makeconf.local | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dde_e100/Makeconf.local b/dde_e100/Makeconf.local index 6a2da817..40e3e8e4 100644 --- a/dde_e100/Makeconf.local +++ b/dde_e100/Makeconf.local @@ -5,7 +5,7 @@ SYSTEM = x86-l4v2 BUILDDIR ?= .. libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a -libddekit_path := -L$(BUILDDIR)/libddekit -lddekit +libddekit_path := $(BUILDDIR)/libddekit/libddekit.a libslab_path := -L$(BUILDDIR)/libhurd-slab -lhurd-slab libbpf_path := -L$(BUILDDIR)/libbpf -lbpf diff --git a/dde_e1000/Makeconf.local b/dde_e1000/Makeconf.local index 6a2da817..40e3e8e4 100644 --- a/dde_e1000/Makeconf.local +++ b/dde_e1000/Makeconf.local @@ -5,7 +5,7 @@ SYSTEM = x86-l4v2 BUILDDIR ?= .. libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a -libddekit_path := -L$(BUILDDIR)/libddekit -lddekit +libddekit_path := $(BUILDDIR)/libddekit/libddekit.a libslab_path := -L$(BUILDDIR)/libhurd-slab -lhurd-slab libbpf_path := -L$(BUILDDIR)/libbpf -lbpf diff --git a/dde_ne2k_pci/Makeconf.local b/dde_ne2k_pci/Makeconf.local index 6a2da817..40e3e8e4 100644 --- a/dde_ne2k_pci/Makeconf.local +++ b/dde_ne2k_pci/Makeconf.local @@ -5,7 +5,7 @@ SYSTEM = x86-l4v2 BUILDDIR ?= .. libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a -libddekit_path := -L$(BUILDDIR)/libddekit -lddekit +libddekit_path := $(BUILDDIR)/libddekit/libddekit.a libslab_path := -L$(BUILDDIR)/libhurd-slab -lhurd-slab libbpf_path := -L$(BUILDDIR)/libbpf -lbpf diff --git a/dde_pcnet32/Makeconf.local b/dde_pcnet32/Makeconf.local index 6a2da817..40e3e8e4 100644 --- a/dde_pcnet32/Makeconf.local +++ b/dde_pcnet32/Makeconf.local @@ -5,7 +5,7 @@ SYSTEM = x86-l4v2 BUILDDIR ?= .. libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a -libddekit_path := -L$(BUILDDIR)/libddekit -lddekit +libddekit_path := $(BUILDDIR)/libddekit/libddekit.a libslab_path := -L$(BUILDDIR)/libhurd-slab -lhurd-slab libbpf_path := -L$(BUILDDIR)/libbpf -lbpf diff --git a/dde_rtl8139/Makeconf.local b/dde_rtl8139/Makeconf.local index 6a2da817..40e3e8e4 100644 --- a/dde_rtl8139/Makeconf.local +++ b/dde_rtl8139/Makeconf.local @@ -5,7 +5,7 @@ SYSTEM = x86-l4v2 BUILDDIR ?= .. libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a -libddekit_path := -L$(BUILDDIR)/libddekit -lddekit +libddekit_path := $(BUILDDIR)/libddekit/libddekit.a libslab_path := -L$(BUILDDIR)/libhurd-slab -lhurd-slab libbpf_path := -L$(BUILDDIR)/libbpf -lbpf -- cgit v1.2.3