udisks: Remove this obsolete version
PATCH 1/1 udisks: Remove this obsolete version
All users already switced to udisks2.
Signed-off-by Adrian Bunk <[email protected]>
--- .../packagegroups/packagegroup-meta-oe.bb | 2 +- ...ke-udev-rules-directory-configurable.patch | 89 ---- ...-fix-build-with-newer-glibc-versions.patch | 27 - .../udisks/0001-include-sys-sysmacros.h.patch | 77 --- ...sh_completion-script-in-etc-bash_com.patch | 33 -- ...r-Use-sh-interpreter-instead-of-bash.patch | 38 -- .../udisks/udisks/optional-depends.patch | 498 ------------------ .../udisks-1.0.5-fix-service-file.patch | 32 -- .../recipes-support/udisks/udisks_1.0.5.bb | 51 -- 9 files changed, 1 insertion(+), 846 deletions(-) delete mode 100644 meta-oe/recipes-support/udisks/udisks/0001-Make-udev-rules-directory-configurable.patch delete mode 100644 meta-oe/recipes-support/udisks/udisks/0001-fix-build-with-newer-glibc-versions.patch delete mode 100644 meta-oe/recipes-support/udisks/udisks/0001-include-sys-sysmacros.h.patch delete mode 100644 meta-oe/recipes-support/udisks/udisks/0001-tools-Install-bash_completion-script-in-etc-bash_com.patch delete mode 100644 meta-oe/recipes-support/udisks/udisks/0001-udisks-helper-Use-sh-interpreter-instead-of-bash.patch delete mode 100644 meta-oe/recipes-support/udisks/udisks/optional-depends.patch delete mode 100644 meta-oe/recipes-support/udisks/udisks/udisks-1.0.5-fix-service-file.patch delete mode 100644 meta-oe/recipes-support/udisks/udisks_1.0.5.bb
meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +1 -1
@@ -251,7 +251,7 @@ RDEPENDS_packagegroup-meta-oe-support ="\ libcanberra \ ${@bb.utils.contains("DISTRO_FEATURES", "x11 pam", "xorgxrdp xrdp", "", d)} \ procmail \ - ${@bb.utils.contains("DISTRO_FEATURES", "polkit", "udisks udisks2 upower", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "polkit", "udisks2 upower", "", d)} \ ${NE10} \ "
meta-oe/recipes-support/udisks/udisks/0001-Make-udev-rules-directory-configurable.patch deleted +0 -89
89 lines not on this page · raw message
meta-oe/recipes-support/udisks/udisks/0001-fix-build-with-newer-glibc-versions.patch deleted +0 -27
@@ -1,27 +0,0 @@ -From 054ad6a06cfac7c3d172d53cd901204079a53ec3 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <[email protected]> -Date: Fri, 29 May 2015 21:09:39 -0400 -Subject: [PATCH] fix build with newer glibc versions - -https://bugs.freedesktop.org/show_bug.cgi?id=90778 - -Upstream-Status: Applied [1] - -[1] http://cgit.freedesktop.org/udisks/commit/?h=udisks1&id=9829152b12a8924d2e091a00133ed1a3a7ba75c0 - ---- - src/helpers/job-drive-detach.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/helpers/job-drive-detach.c b/src/helpers/job-drive-detach.c -index eeafcab..d122a1f 100644 ---- a/src/helpers/job-drive-detach.c -+++ b/src/helpers/job-drive-detach.c -@@ -18,6 +18,7 @@ - * - */ - -+#include <sys/stat.h> - #include <stdio.h> - #include <string.h> - #include <errno.h>
meta-oe/recipes-support/udisks/udisks/0001-include-sys-sysmacros.h.patch deleted +0 -77
77 lines not on this page · raw message
meta-oe/recipes-support/udisks/udisks/0001-tools-Install-bash_completion-script-in-etc-bash_com.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From 7863a72c723035529d6fd8d626d7fbf9a765f162 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Thu, 23 May 2019 21:49:57 -0700 -Subject: [PATCH] tools: Install bash_completion script in - /etc/bash_completion.d - -In OE this is one of common locations to install bash_completion files -and its covered for packaging automatically when bash_completion class -is inherited - -Upstream-Status: Inappropriate [OE-Specific] - -Signed-off-by: Khem Raj <[email protected]> ---- - tools/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/Makefile.am b/tools/Makefile.am -index 0aaec11..839c961 100644 ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -72,7 +72,7 @@ udisks_tcp_bridge_LDADD = $(DBUS_GLIB_LIBS) - - CLEANFILES = $(BUILT_SOURCES) - --profiledir = $(sysconfdir)/profile.d -+profiledir = $(sysconfdir)/bash_completion.d - profile_SCRIPTS = udisks-bash-completion.sh - - EXTRA_DIST = $(profile_SCRIPTS) --- -2.21.0 -
meta-oe/recipes-support/udisks/udisks/0001-udisks-helper-Use-sh-interpreter-instead-of-bash.patch deleted +0 -38
@@ -1,38 +0,0 @@ -From 44953e5501e92c87611be45221338004e8032a74 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Thu, 23 May 2019 22:00:14 -0700 -Subject: [PATCH] udisks-helper: Use sh interpreter instead of bash - -These scripts do not require bash, since they do not use any bash -specific extentions - -Upstream-Status: Pending -Signed-off-by: Khem Raj <[email protected]> ---- - src/helpers/udisks-helper-change-luks-password | 2 +- - src/helpers/udisks-helper-mdadm-expand | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/helpers/udisks-helper-change-luks-password b/src/helpers/udisks-helper-change-luks-password -index edcf6c9..c71fc72 100755 ---- a/src/helpers/udisks-helper-change-luks-password -+++ b/src/helpers/udisks-helper-change-luks-password -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env sh - set -e - - DEVICE=$1 -diff --git a/src/helpers/udisks-helper-mdadm-expand b/src/helpers/udisks-helper-mdadm-expand -index 8b4e23d..921f96a 100755 ---- a/src/helpers/udisks-helper-mdadm-expand -+++ b/src/helpers/udisks-helper-mdadm-expand -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env sh - - set -e - --- -2.21.0 -
meta-oe/recipes-support/udisks/udisks/optional-depends.patch deleted +0 -498
498 lines not on this page · raw message
meta-oe/recipes-support/udisks/udisks/udisks-1.0.5-fix-service-file.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From a4f6aa5be37ae6e2194c9ded2ea8c1da330f5694 Mon Sep 17 00:00:00 2001 -From: David King <[email protected]> -Date: Thu, 2 Jul 2015 13:49:22 +0100 -Subject: [PATCH] Fix systemd service file - -udisks-daemon is installed to $(libexecdir), not $(prefix)/lib/udisks. - -https://bugzilla.redhat.com/show_bug.cgi?id=1238664 -https://bugs.freedesktop.org/show_bug.cgi?id=91191 - -Taken-From: [1] -[1] http://pkgs.fedoraproject.org/cgit/udisks.git/tree/udisks-1.0.5-fix-service-file.patch - -Upstream-Status: Pending - ---- - data/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/Makefile.am b/data/Makefile.am -index 411ea0f..08af5f4 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -31,7 +31,7 @@ systemdservicedir = $(systemdsystemunitdir) - systemdservice_DATA = $(systemdservice_in_files:.service.in=.service) - - $(systemdservice_DATA): $(systemdservice_in_files) Makefile -- @sed -e "s|\@libexecdir\@|$(prefix)/lib/udisks|" $< > $@ -+ @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ - endif - - udevrulesdir = $(slashlibdir)/udev/rules.d
meta-oe/recipes-support/udisks/udisks_1.0.5.bb deleted +0 -51
51 lines not on this page · raw message
Signature · 1 line
2.17.1