diff --git a/meta-citadel/recipes-core/util-linux/util-linux/ioctl_fix.patch b/meta-citadel/recipes-core/util-linux/util-linux/ioctl_fix.patch deleted file mode 100644 index 1037284..0000000 --- a/meta-citadel/recipes-core/util-linux/util-linux/ioctl_fix.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 32337d96b1fda2d8bfff753277f45a1ba0ee118c Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Thu, 23 Nov 2017 10:30:27 +0100 -Subject: [PATCH] hwclock: revert ioctl test - -This commit reverts 1d5cffa16a0183175684809cf215294ec20b8fd9. - -(I did this revert manually as there was another changes in the code -and git-revert does not work in this case.) - -Addresses: https://github.com/karelzak/util-linux/issues/543 -Signed-off-by: Karel Zak ---- - sys-utils/hwclock-rtc.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/sys-utils/hwclock-rtc.c b/sys-utils/hwclock-rtc.c -index 62e432937..cdd7d80d6 100644 ---- a/sys-utils/hwclock-rtc.c -+++ b/sys-utils/hwclock-rtc.c -@@ -261,7 +261,7 @@ static int synchronize_to_clock_tick_rtc(const struct hwclock_control *ctl) - * they should. - */ - rc = -1; -- errno = ENOTTY; -+ errno = EINVAL; - #else - rc = ioctl(rtc_fd, RTC_UIE_ON, 0); - #endif -@@ -296,7 +296,7 @@ static int synchronize_to_clock_tick_rtc(const struct hwclock_control *ctl) - if (rc == -1) - warn(_("ioctl() to %s to turn off update interrupts failed"), - rtc_dev_name); -- } else if (errno == ENOTTY) { -+ } else if (errno == ENOTTY || errno == EINVAL) { - /* rtc ioctl interrupts are unimplemented */ - ret = busywait_for_rtc_clock_tick(ctl, rtc_fd); - } else diff --git a/meta-citadel/recipes-core/util-linux/util-linux_2.31.bbappend b/meta-citadel/recipes-core/util-linux/util-linux_2.31.bbappend deleted file mode 100644 index 9b5b04e..0000000 --- a/meta-citadel/recipes-core/util-linux/util-linux_2.31.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -# https://github.com/karelzak/util-linux/issues/543 -SRC_URI += "file://ioctl_fix.patch"