summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/libcap/Makefile29
-rw-r--r--package/libcap/patches/patch-Make_Rules57
-rw-r--r--package/libcap/patches/patch-libcap_Makefile11
-rw-r--r--package/libcap/patches/patch-libcap__makenames_c11
-rw-r--r--package/libvirt/Makefile6
-rw-r--r--package/systemd/Makefile54
-rw-r--r--package/systemd/files/udev.conffiles (renamed from package/udev/files/udev.conffiles)0
-rw-r--r--package/udev/Makefile38
-rw-r--r--package/util-linux/Makefile2
-rw-r--r--package/util-linux/patches/patch-libblkid_blkid_pc_in12
-rw-r--r--package/xf86-input-evdev/Makefile2
-rw-r--r--package/xf86-input-evdev/patches/patch-ltmain_sh11
-rw-r--r--package/xf86-video-ati/Makefile4
13 files changed, 181 insertions, 56 deletions
diff --git a/package/libcap/Makefile b/package/libcap/Makefile
new file mode 100644
index 000000000..af8fef397
--- /dev/null
+++ b/package/libcap/Makefile
@@ -0,0 +1,29 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= libcap
+PKG_VERSION:= 2.22
+PKG_RELEASE:= 1
+PKG_MD5SUM:= ce64058bdb3f086ddbfca8ce6c919845
+PKG_DESCR:= capabilities library
+PKG_SECTION:= libs
+PKG_URL:= http://www.friedhoff.org/posixfilecaps.html
+PKG_SITES:= http://openadk.org/distfiles/
+PKG_OPTS:= dev
+
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBCAP,libcap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+CONFIG_STYLE:= manual
+
+libcap-install:
+ $(INSTALL_DIR) $(IDIR_LIBCAP)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libcap*.so* \
+ $(IDIR_LIBCAP)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libcap/patches/patch-Make_Rules b/package/libcap/patches/patch-Make_Rules
new file mode 100644
index 000000000..95bd663d9
--- /dev/null
+++ b/package/libcap/patches/patch-Make_Rules
@@ -0,0 +1,57 @@
+--- libcap-2.22.orig/Make.Rules 2011-07-25 04:18:23.000000000 +0200
++++ libcap-2.22/Make.Rules 2013-10-28 11:38:54.000000000 +0100
+@@ -12,10 +12,6 @@ FAKEROOT=$(DESTDIR)
+ # These choices are motivated by the fact that getcap and setcap are
+ # administrative operations that could be needed to recover a system.
+
+-ifndef lib
+-lib=$(shell ldd /usr/bin/ld|fgrep ld-linux|cut -d/ -f2)
+-endif
+-
+ ifdef prefix
+ exec_prefix=$(prefix)
+ lib_prefix=$(exec_prefix)
+@@ -23,7 +19,7 @@ inc_prefix=$(lib_prefix)
+ man_prefix=$(prefix)/share
+ else
+ prefix=/usr
+-exec_prefix=
++exec_prefix=/usr
+ lib_prefix=$(exec_prefix)
+ inc_prefix=$(prefix)
+ man_prefix=$(prefix)/share
+@@ -34,7 +30,7 @@ endif
+ MANDIR=$(FAKEROOT)$(man_prefix)/man
+ SBINDIR=$(FAKEROOT)$(exec_prefix)/sbin
+ INCDIR=$(FAKEROOT)$(inc_prefix)/include
+-LIBDIR=$(FAKEROOT)$(lib_prefix)/$(lib)
++LIBDIR=$(FAKEROOT)$(lib_prefix)/lib
+
+ # common defines for libcap
+ LIBTITLE=libcap
+@@ -47,8 +43,9 @@ MINOR=22
+ KERNEL_HEADERS := $(topdir)/libcap/include
+ IPATH += -fPIC -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
+
+-CC := gcc
+-CFLAGS := -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++CC ?= gcc
++CFLAGS ?= -O2
++CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ BUILD_CC := $(CC)
+ BUILD_CFLAGS := $(CFLAGS) $(IPATH)
+ AR := ar
+@@ -64,11 +61,11 @@ LDFLAGS := #-g
+ SYSTEM_HEADERS = /usr/include
+ INCS=$(topdir)/libcap/include/sys/capability.h
+ LDFLAGS += -L$(topdir)/libcap
+-CFLAGS += -Dlinux $(WARNINGS) $(DEBUG)
++CFLAGS += -Dlinux $(WARNINGS)
+ PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
+ INDENT := $(shell if [ -n "$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
+ DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi)
+-LIBATTR := yes
++LIBATTR := no
+
+ # When installing setcap, set its inheritable bit to be able to place
+ # capabilities on files. It can be used in conjunction with pam_cap
diff --git a/package/libcap/patches/patch-libcap_Makefile b/package/libcap/patches/patch-libcap_Makefile
new file mode 100644
index 000000000..034353ad5
--- /dev/null
+++ b/package/libcap/patches/patch-libcap_Makefile
@@ -0,0 +1,11 @@
+--- libcap-2.22.orig/libcap/Makefile 2010-08-09 00:26:04.000000000 +0200
++++ libcap-2.22/libcap/Makefile 2013-10-28 10:46:10.000000000 +0100
+@@ -33,7 +33,7 @@ INCLUDE_GPERF_OUTPUT = -include $(GPERF_
+ endif
+
+ _makenames: _makenames.c cap_names.list.h
+- $(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
++ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $< -o $@
+
+ cap_names.h: _makenames
+ ./_makenames > cap_names.h
diff --git a/package/libcap/patches/patch-libcap__makenames_c b/package/libcap/patches/patch-libcap__makenames_c
new file mode 100644
index 000000000..641bd6592
--- /dev/null
+++ b/package/libcap/patches/patch-libcap__makenames_c
@@ -0,0 +1,11 @@
+--- libcap-2.22.orig/libcap/_makenames.c 2008-12-04 08:03:12.000000000 +0100
++++ libcap-2.22/libcap/_makenames.c 2013-10-28 10:54:58.000000000 +0100
+@@ -7,7 +7,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <sys/capability.h>
++#include "include/sys/capability.h"
+
+ /*
+ * #include 'sed' generated array
diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile
index c424afff7..7f06db28e 100644
--- a/package/libvirt/Makefile
+++ b/package/libvirt/Makefile
@@ -9,10 +9,10 @@ PKG_RELEASE:= 2
PKG_MD5SUM:= 3d9f85d586c9aa3d819b626622f3fc97
PKG_DESCR:= virtualization API
PKG_SECTION:= libs
-PKG_BUILDDEP:= libxml2 gnutls python2 libpcap parted udev
+PKG_BUILDDEP:= libxml2 gnutls python2 libpcap parted systemd
PKG_DEPENDS:= libxml2 libgnutls python2 libpcap libreadline
-PKG_DEPENDS+= libintl dmidecode kmod-netfilter-xt-target-checksum
-PKG_DEPENDS+= dnsmasq qemu libnl
+PKG_DEPENDS+= dmidecode kmod-netfilter-xt-target-checksum
+PKG_DEPENDS+= dnsmasq qemu libnl libudev
PKG_URL:= http://www.libvirt.org/
PKG_SITES:= http://libvirt.org/sources/
PKG_OPTS:= dev
diff --git a/package/systemd/Makefile b/package/systemd/Makefile
new file mode 100644
index 000000000..c609f821c
--- /dev/null
+++ b/package/systemd/Makefile
@@ -0,0 +1,54 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:= systemd
+PKG_VERSION:= 208
+PKG_RELEASE:= 1
+PKG_MD5SUM:= df64550d92afbffb4f67a434193ee165
+PKG_DESCR:= System and Service Manager
+PKG_SECTION:= utils
+PKG_DEPENDS:= libblkid
+PKG_BUILDDEP:= usbutils glib kmod util-linux
+PKG_URL:= http://freedesktop.org/wiki/Software/systemd/
+PKG_SITES:= http://www.freedesktop.org/software/systemd/
+PKG_LIBNAME:= libudev
+PKG_OPTS:= dev
+
+PKG_LIBC_DEPENDS:= eglibc glibc musl
+PKG_SUBPKGS:= UDEV LIBUDEV
+PKGSC_LIBUDEV:= libs
+PKGSD_LIBUDEV:= UDEV library
+PKGSD_UDEV:= Dynamic device management subsystem
+
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,UDEV,udev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBUDEV,libudev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+TARGET_LDFLAGS+= -lrt
+CONFIGURE_ARGS+= --disable-logging \
+ --disable-static \
+ --without-python \
+ --with-pci-ids-path=/usr/share/pci.ids \
+ --disable-introspection
+
+udev-install:
+ ${INSTALL_DIR} ${IDIR_UDEV}/usr/bin ${IDIR_UDEV}/etc/udev
+ ${INSTALL_DIR} ${IDIR_UDEV}/usr/lib/udev
+ ${CP} ${WRKINST}/etc/udev/* ${IDIR_UDEV}/etc/udev
+ ${CP} ${WRKINST}/usr/lib/udev/* ${IDIR_UDEV}/usr/lib/udev
+ ${CP} ${WRKINST}/usr/bin/udevadm ${IDIR_UDEV}/usr/bin
+
+libudev-install:
+ ${INSTALL_DIR} ${IDIR_LIBUDEV}/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libudev.so* $(IDIR_LIBUDEV)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/udev/files/udev.conffiles b/package/systemd/files/udev.conffiles
index 50a5fb889..50a5fb889 100644
--- a/package/udev/files/udev.conffiles
+++ b/package/systemd/files/udev.conffiles
diff --git a/package/udev/Makefile b/package/udev/Makefile
deleted file mode 100644
index 5a1a51926..000000000
--- a/package/udev/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include ${TOPDIR}/rules.mk
-
-PKG_NAME:= udev
-PKG_VERSION:= 182
-PKG_RELEASE:= 1
-PKG_MD5SUM:= e31c83159b017e8ab0fa2f4bca758a41
-PKG_DESCR:= Dynamic device management subsystem
-PKG_SECTION:= utils
-PKG_BUILDDEP:= usbutils glib kmod
-PKG_URL:= http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
-PKG_SITES:= ${MASTER_SITE_KERNEL:=utils/kernel/hotplug/}
-PKG_OPTS:= dev
-
-PKG_LIBC_DEPENDS:= eglibc glibc musl
-
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,UDEV,udev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-
-TARGET_LDFLAGS+= -lrt
-CONFIGURE_ARGS+= --disable-logging \
- --with-pci-ids-path=/usr/share/pci.ids \
- --disable-introspection
-
-udev-install:
- ${INSTALL_DIR} ${IDIR_UDEV}/usr/bin ${IDIR_UDEV}/etc/udev
- ${INSTALL_DIR} ${IDIR_UDEV}/usr/lib ${IDIR_UDEV}/usr/libexec/udev
- $(CP) $(WRKINST)/usr/lib/libudev.so* $(IDIR_UDEV)/usr/lib
- ${CP} ${WRKINST}/etc/udev/* ${IDIR_UDEV}/etc/udev
- ${CP} ${WRKINST}/usr/libexec/udev/* ${IDIR_UDEV}/usr/libexec/udev
- ${CP} ${WRKINST}/usr/bin/udevadm ${IDIR_UDEV}/usr/bin
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index a95e10963..a99c5ed0d 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= util-linux
PKG_VERSION:= 2.23.2
-PKG_RELEASE:= 4
+PKG_RELEASE:= 5
PKG_MD5SUM:= b39fde897334a4858bb2098edcce5b3f
PKG_DESCR:= Linux utilities (meta-package)
PKG_SECTION:= utils
diff --git a/package/util-linux/patches/patch-libblkid_blkid_pc_in b/package/util-linux/patches/patch-libblkid_blkid_pc_in
new file mode 100644
index 000000000..475bc2f92
--- /dev/null
+++ b/package/util-linux/patches/patch-libblkid_blkid_pc_in
@@ -0,0 +1,12 @@
+--- util-linux-2.23.2.orig/libblkid/blkid.pc.in 2013-02-27 17:46:29.000000000 +0100
++++ util-linux-2.23.2/libblkid/blkid.pc.in 2013-10-28 12:08:14.000000000 +0100
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@usrlib_execdir@
+-includedir=@includedir@
++libdir=${prefix}/lib
++includedir=${prefix}/include
+
+ Name: blkid
+ Description: Block device id library
diff --git a/package/xf86-input-evdev/Makefile b/package/xf86-input-evdev/Makefile
index 58c998e32..2dddafd46 100644
--- a/package/xf86-input-evdev/Makefile
+++ b/package/xf86-input-evdev/Makefile
@@ -13,7 +13,7 @@ PKG_DEPENDS:= xorg-server kmod-input-evdev
PKG_BUILDDEP:= xorg-server
PKG_SITES:= ${MASTER_SITE_XORG}
-PKG_ARCH_DEPENDS:= !arm !avr32 !m68k
+PKG_ARCH_DEPENDS:= !avr32 !m68k
PKG_CFLINE_XF86_INPUT_EVDEV:= depends on ADK_TARGET_WITH_INPUT
diff --git a/package/xf86-input-evdev/patches/patch-ltmain_sh b/package/xf86-input-evdev/patches/patch-ltmain_sh
deleted file mode 100644
index f679ecee5..000000000
--- a/package/xf86-input-evdev/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- xf86-input-keyboard-1.5.0.orig/ltmain.sh 2010-10-30 18:15:40.000000000 +0200
-+++ xf86-input-keyboard-1.5.0/ltmain.sh 2011-01-24 19:31:12.000000000 +0100
-@@ -5091,7 +5091,7 @@ func_mode_link ()
- # @file GCC response files
- # -tp=* Portland pgcc target processor selection
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
-+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto*)
- func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
- func_append compile_command " $arg"
diff --git a/package/xf86-video-ati/Makefile b/package/xf86-video-ati/Makefile
index 592616a87..32c5178f5 100644
--- a/package/xf86-video-ati/Makefile
+++ b/package/xf86-video-ati/Makefile
@@ -9,8 +9,8 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 6bb71cff9ad9c5c7b258b2b6c56fdc95
PKG_DESCR:= X11 driver for ATI VGA chip
PKG_SECTION:= x11/drivers
-PKG_BUILDDEP:= xorg-server libdrm xf86driproto MesaLib udev
-PKG_DEPENDS:= xorg-server libdrm mesalib udev
+PKG_BUILDDEP:= xorg-server libdrm xf86driproto MesaLib systemd
+PKG_DEPENDS:= xorg-server libdrm mesalib libudev
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_NEED_CXX:= 1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 12:26:45 +0000