aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2019-05-20 16:38:33 +0200
committerPetr Štetiar <ynezz@true.cz>2019-07-22 09:53:01 +0200
commitf573d3de118476879d4a600b3216a1b49b87cdf9 (patch)
treef162672c200d2bee8690c321ecc68058ff4ea569 /package
parent81c5a5c4b325a3baf64be26c452fee17ff9e62ee (diff)
downloadupstream-f573d3de118476879d4a600b3216a1b49b87cdf9.tar.gz
upstream-f573d3de118476879d4a600b3216a1b49b87cdf9.tar.bz2
upstream-f573d3de118476879d4a600b3216a1b49b87cdf9.zip
base-files: move urandom seed bits into separate package
So it's possible to install or remove it as needed. Tested-by: Lucian Cristian <lucian.cristian@gmail.com> Signed-off-by: Petr Štetiar <ynezz@true.cz> (cherry picked from commit 27bfde9c9f789dbfabebf13047e8b042c27cdeef)
Diffstat (limited to 'package')
-rw-r--r--package/base-files/Makefile11
-rw-r--r--package/system/urandom-seed/Makefile32
-rwxr-xr-xpackage/system/urandom-seed/files/etc/init.d/urandom_seed (renamed from package/base-files/files/etc/init.d/urandom_seed)0
-rw-r--r--package/system/urandom-seed/files/lib/preinit/81_urandom_seed (renamed from package/base-files/files/lib/preinit/81_urandom_seed)0
-rwxr-xr-xpackage/system/urandom-seed/files/sbin/urandom_seed (renamed from package/base-files/files/sbin/urandom_seed)0
5 files changed, 42 insertions, 1 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 609ffa2c38..91d677acb3 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk
include $(INCLUDE_DIR)/feeds.mk
PKG_NAME:=base-files
-PKG_RELEASE:=197
+PKG_RELEASE:=198
PKG_FLAGS:=nonshared
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
@@ -43,6 +43,15 @@ define Package/base-files
VERSION:=$(PKG_RELEASE)-$(REVISION)
endef
+define Package/urandom-seed
+ SECTION:=base
+ CATEGORY:=Base system
+ DEPENDS:=+libc +ubox-getrandom
+ TITLE:=/etc/urandom.seed handling for OpenWrt
+ URL:=http://openwrt.org/
+ VERSION:=$(PKG_RELEASE)-$(REVISION)
+endef
+
define Package/base-files/conffiles
/etc/config/
/etc/config/network
diff --git a/package/system/urandom-seed/Makefile b/package/system/urandom-seed/Makefile
new file mode 100644
index 0000000000..6bde2e0b8a
--- /dev/null
+++ b/package/system/urandom-seed/Makefile
@@ -0,0 +1,32 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=urandom-seed
+PKG_VERSION:=1.0
+PKG_RELEASE:=1
+PKG_LICENSE:=GPL-2.0
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/$(PKG_NAME)
+ SECTION:=base
+ CATEGORY:=Base system
+ DEPENDS:=+getrandom
+ TITLE:=/etc/urandom.seed handling for OpenWrt
+ URL:=http://openwrt.org/
+endef
+
+define Build/Prepare
+ mkdir -p $(PKG_BUILD_DIR)
+endef
+
+define Build/Compile/Default
+endef
+Build/Compile = $(Build/Compile/Default)
+
+define Package/$(PKG_NAME)/install
+ $(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,urandom-seed))
diff --git a/package/base-files/files/etc/init.d/urandom_seed b/package/system/urandom-seed/files/etc/init.d/urandom_seed
index 17d9c13400..17d9c13400 100755
--- a/package/base-files/files/etc/init.d/urandom_seed
+++ b/package/system/urandom-seed/files/etc/init.d/urandom_seed
diff --git a/package/base-files/files/lib/preinit/81_urandom_seed b/package/system/urandom-seed/files/lib/preinit/81_urandom_seed
index 26212c60b5..26212c60b5 100644
--- a/package/base-files/files/lib/preinit/81_urandom_seed
+++ b/package/system/urandom-seed/files/lib/preinit/81_urandom_seed
diff --git a/package/base-files/files/sbin/urandom_seed b/package/system/urandom-seed/files/sbin/urandom_seed
index 7043e8af4e..7043e8af4e 100755
--- a/package/base-files/files/sbin/urandom_seed
+++ b/package/system/urandom-seed/files/sbin/urandom_seed