diff --git a/filesystem/udev/no_libvolume_id.patch b/filesystem/udev/no_libvolume_id.patch deleted file mode 100644 index b418f1393..000000000 --- a/filesystem/udev/no_libvolume_id.patch +++ /dev/null @@ -1,29 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../udev/no_libvolume_id.patch -# Copyright (C) 2006 - 2009 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- ./extras/volume_id/Makefile.orig 2008-06-12 08:24:30.000000000 +0300 -+++ ./extras/volume_id/Makefile 2009-02-01 17:23:26.000000000 +0200 -@@ -61,8 +61,8 @@ - - install-bin: all - $(INSTALL) -d $(DESTDIR)$(libudevdir) -- $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG) -- $(MAKE) -C lib install -+ echo $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG) -+ echo $(MAKE) -C lib install - .PHONY: install-bin - - uninstall-bin: diff --git a/filesystem/udev/no_libvolume_id_so.diff b/filesystem/udev/no_libvolume_id_so.diff deleted file mode 100644 index a3245d246..000000000 --- a/filesystem/udev/no_libvolume_id_so.diff +++ /dev/null @@ -1,42 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../udev/no_libvolume_id_so.diff -# Copyright (C) 2008 - 2009 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- ./extras/volume_id/lib/Makefile.orig 2008-06-12 08:24:30.000000000 +0300 -+++ ./extras/volume_id/lib/Makefile 2009-02-01 20:48:11.000000000 +0200 -@@ -60,7 +60,7 @@ - libvolume_id.h \ - util.h - --all: libvolume_id.a $(SHLIB) libvolume_id.pc -+all: libvolume_id.a libvolume_id.pc - .PHONY: all - .DEFAULT: all - -@@ -107,14 +107,7 @@ - $(INSTALL) -d $(DESTDIR)$(includedir) - $(INSTALL_DATA) libvolume_id.h $(DESTDIR)$(includedir)/libvolume_id.h - $(INSTALL) -d $(DESTDIR)$(libdir) -- $(INSTALL_LIB) $(SHLIB) $(DESTDIR)$(libdir)/$(SHLIB) - $(INSTALL) -d $(DESTDIR)$(usrlibdir) -- ln -sf $(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR) --ifeq ($(libdir),$(usrlibdir)) -- ln -sf $(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so --else -- ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so --endif - $(INSTALL) -d $(DESTDIR)$(usrlibdir)/pkgconfig - $(INSTALL_DATA) libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc - .PHONY: install diff --git a/filesystem/udev/udev.conf b/filesystem/udev/udev.conf index 104352312..4ba622ca4 100644 --- a/filesystem/udev/udev.conf +++ b/filesystem/udev/udev.conf @@ -46,12 +46,6 @@ var_append makeopt ' ' "LD=$CC" var_append makeopt ' ' 'DEBUG=true' -# FIXME: For now we have to build it static by default because of our initrd! -#if [ "$SDECFG_STATIC" == "1" ]; then - var_append makeopt ' ' "VOLUME_ID_STATIC=true" - var_append patchfiles ' ' "$confdir/no_libvolume_id_so.diff" -#fi - # list of extra helpers to build and install hook_add postpatch 5 "export extras=\$( ls -1d extras/* | grep -v '\.sh' | tr '\n' ' ' )" var_append makeopt ' ' 'EXTRAS="$extras"'