Browse Source

add systemd instead of udev, prjects were merged upstream, add libudev subpackage. update and fix evdev driver for musl

Waldemar Brodkorb 10 năm trước cách đây
mục cha
commit
cd770ba2f4

+ 3 - 3
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

+ 54 - 0
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

+ 0 - 0
package/udev/files/udev.conffiles → package/systemd/files/udev.conffiles


+ 0 - 38
package/udev/Makefile

@@ -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

+ 1 - 1
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
 

+ 0 - 11
package/xf86-input-evdev/patches/patch-ltmain_sh

@@ -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"

+ 2 - 2
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