From: Hauke Mehrtens Date: Thu, 18 May 2023 15:12:36 +0000 (+0200) Subject: util-linux: Use SYS_getrandom in randutils.c X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3a935f7ea9214c831eccc585f0677c5132957dde;p=openwrt%2Fstaging%2Fnbd.git util-linux: Use SYS_getrandom in randutils.c The getrandom syscall is not hanging at bootup any more if there is not enough entropy. This was fixed upstream in 2018 in commit: https://github.com/util-linux/util-linux/commit/a9cf659e0508c1f56813a7d74c64f67bbc962538 This OpenWrt patch is not needed any more. This reverts commit e64463ebde55 ("util-linux: avoid using the getrandom syscall") Signed-off-by: Hauke Mehrtens --- diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile index 8dab621390..704d4f11ec 100644 --- a/package/utils/util-linux/Makefile +++ b/package/utils/util-linux/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=util-linux PKG_VERSION:=2.39 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.39 diff --git a/package/utils/util-linux/patches/210-use-urandom.patch b/package/utils/util-linux/patches/210-use-urandom.patch deleted file mode 100644 index 5817209885..0000000000 --- a/package/utils/util-linux/patches/210-use-urandom.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/lib/randutils.c -+++ b/lib/randutils.c -@@ -26,6 +26,11 @@ - #define THREAD_LOCAL static - #endif - -+/* force /dev/urandom to avoid hanging on early boot */ -+#undef HAVE_GETRANDOM -+#undef SYS_getrandom -+#undef __NR_getrandom -+ - #ifdef HAVE_GETRANDOM - # include - #elif defined (__linux__)