From 3d9001e2cad4598e60676c3295beb2ef6182a2c5 Mon Sep 17 00:00:00 2001 From: David P Date: Thu, 2 Nov 2017 15:10:28 -0300 Subject: Remove some [pcr] packages --- pcr-testing/udisks2-elogind/PKGBUILD | 53 ----------------- pcr-testing/udisks2-elogind/git-fixes.patch | 13 ----- .../udisks2-elogind/udisks-enable-elogind.patch | 67 ---------------------- 3 files changed, 133 deletions(-) delete mode 100644 pcr-testing/udisks2-elogind/PKGBUILD delete mode 100644 pcr-testing/udisks2-elogind/git-fixes.patch delete mode 100644 pcr-testing/udisks2-elogind/udisks-enable-elogind.patch (limited to 'pcr-testing') diff --git a/pcr-testing/udisks2-elogind/PKGBUILD b/pcr-testing/udisks2-elogind/PKGBUILD deleted file mode 100644 index 058b160a7..000000000 --- a/pcr-testing/udisks2-elogind/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# Maintainer: David P. -# Contributor: Alexey D. -# Contributor: Felix Yan -# Contributor: Ionut Biru - -pkgname=udisks2-elogind -pkgver=2.6.4 -pkgrel=1 -pkgdesc="Disk Management Service, version 2" -arch=('armv7h' 'i686' 'x86_64') -url="http://www.freedesktop.org/wiki/Software/udisks" -license=('GPL2') -depends=('glib2' 'polkit-elogind' 'libatasmart' 'libgudev' 'acl' 'eudev-systemd') -makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'python2' 'gnome-common') -optdepends=('parted: partition management' - 'gptfdisk: GUID partition table support' - 'ntfs-3g: NTFS filesystem management support' - 'dosfstools: VFAT filesystem management support') -provides=("udisks2=${pkgver}") -conflicts=('udisks2') -options=(libtool strip) -source=(https://github.com/storaged-project/udisks/releases/download/udisks-${pkgver}/udisks-${pkgver}.tar.bz2 - 'udisks-enable-elogind.patch') -sha256sums=('d65389a861a9a475d3c8e0ad2b8603d9961977f1a00024093b5bacd711e774f2' - '7d47a00ce6d484140a09939e08678b72d9a0212490d70a1d150b06b21b413ba9') - -prepare(){ - cd "udisks-$pkgver" - patch -Np 1 -i ${srcdir}/udisks-enable-elogind.patch - autoreconf -vfi -} - -build() { - cd "udisks-$pkgver" - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --sbindir=/usr/bin \ - --libexecdir=/usr/lib - make - - # fix mdadm location - sed -i -e 's#/sbin/mdadm#/usr/bin/mdadm#g' \ - "${srcdir}/udisks-${pkgver}"/data/80-udisks2.rules -} - -package() { - cd "udisks-$pkgver" - make DESTDIR="$pkgdir" install \ - bash_completiondir=/usr/share/bash-completion/completions -} diff --git a/pcr-testing/udisks2-elogind/git-fixes.patch b/pcr-testing/udisks2-elogind/git-fixes.patch deleted file mode 100644 index cdd1f1f2f..000000000 --- a/pcr-testing/udisks2-elogind/git-fixes.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/data/80-udisks2.rules udisks-2.6.4-lib/data/80-udisks2.rules ---- a/data/80-udisks2.rules 2017-02-14 18:38:41.000000000 -0500 -+++ b/data/80-udisks2.rules 2017-05-09 10:55:41.814085127 -0500 -@@ -93,6 +93,9 @@ - SUBSYSTEMS=="usb", ENV{ID_VENDOR}=="*SanDisk*", ENV{ID_MODEL}=="*Cruzer*", ENV{ID_CDROM}!="1", ENV{ID_DRIVE_THUMB}="1" - SUBSYSTEMS=="usb", ENV{ID_VENDOR}=="HP", ENV{ID_MODEL}=="*v125w*", ENV{ID_DRIVE_THUMB}="1" - SUBSYSTEMS=="usb", ENV{ID_VENDOR_ID}=="13fe", ENV{ID_MODEL}=="*Patriot*", ENV{ID_DRIVE_THUMB}="1" -+ -+# SD-Card reader in Chromebook Pixel -+SUBSYSTEMS=="usb", ENV{ID_VENDOR_ID}=="05e3", ENV{ID_MODEL_ID}=="0727", ENV{ID_DRIVE_FLASH_SD}="1" - SUBSYSTEMS=="usb", ENV{ID_VENDOR}=="*JetFlash*", ENV{ID_MODEL}=="*Transcend*", ENV{ID_DRIVE_THUMB}="1" - - # SD-Card reader in Chromebook Pixel diff --git a/pcr-testing/udisks2-elogind/udisks-enable-elogind.patch b/pcr-testing/udisks2-elogind/udisks-enable-elogind.patch deleted file mode 100644 index 2cf619258..000000000 --- a/pcr-testing/udisks2-elogind/udisks-enable-elogind.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- a/configure.ac 2017-02-14 18:38:41.000000000 -0500 -+++ b/configure.ac 2017-05-09 10:38:43.187459993 -0500 -@@ -170,6 +170,17 @@ - AC_SUBST(LIBSYSTEMD_LOGIN_CFLAGS) - AC_SUBST(LIBSYSTEMD_LOGIN_LIBS) - -+PKG_CHECK_MODULES(LIBELOGIND, [libelogind >= 219], -+ [have_libelogind=yes], -+ [have_libelogins=no]) -+AM_CONDITIONAL(HAVE_LIBELOGIND, test x$have_libelogind = xyes) -+if test "x$have_libelogind" = "xyes"; then -+ AC_DEFINE([HAVE_LIBELOGIND], 1, [Define to 1 if libelogind is available]) -+fi -+AC_SUBST(HAVE_LIBELOGIND) -+AC_SUBST(LIBELOGIND_CFLAGS) -+AC_SUBST(LIBELOGIND_LIBS) -+ - # udevdir - AC_ARG_WITH([udevdir], - AS_HELP_STRING([--with-udevdir=DIR], [Directory for udev]), -@@ -600,6 +611,7 @@ - udevdir: ${udevdir} - systemdsystemunitdir: ${systemdsystemunitdir} - using libsystemd-login: ${have_libsystemd_login} -+ using libelogind: ${have_libelogind} - use /media for mounting: ${fhs_media} - acl support: ${have_acl} - libblockdev_part support: ${have_libblockdev_part} - ---- a/src/Makefile.am 2017-02-14 18:38:44.000000000 -0500 -+++ b/src/Makefile.am 2017-05-09 10:41:47.087452500 -0500 -@@ -100,6 +100,7 @@ - $(POLKIT_GOBJECT_1_CFLAGS) \ - $(ACL_CFLAGS) \ - $(LIBSYSTEMD_LOGIN_CFLAGS) \ -+ $(LIBELOGIND_CFLAGS) \ - $(PART_CFLAGS) \ - $(NULL) - -@@ -112,6 +113,7 @@ - $(POLKIT_GOBJECT_1_LIBS) \ - $(ACL_LIBS) \ - $(LIBSYSTEMD_LOGIN_LIBS) \ -+ $(LIBELOGIND_LIBS) \ - $(PART_LDFLAGS) \ - $(top_builddir)/udisks/libudisks2.la \ - $(NULL) - ---- a/src/udisksdaemonutil.c 2017-02-14 18:38:44.000000000 -0500 -+++ b/src/udisksdaemonutil.c 2017-05-09 10:43:26.650781771 -0500 -@@ -45,6 +45,16 @@ - #include - #include - -+#endif -+ -+#if defined(HAVE_ELOGIND) && !defined(HAVE_LIBSYSTEMD_LOGIN) -+#include -+/* re-use HAVE_LIBSYSTEMD_LOGIN to not clutter the source file */ -+#define HAVE_LIBSYSTEMD_LOGIN 1 -+#endif -+ -+#if defined(HAVE_LIBSYSTEMD_LOGIN) -+ - #define LOGIND_AVAILABLE() (access("/run/systemd/seats/", F_OK) >= 0) - #endif - -- cgit v1.2.3