[openwrt/openwrt] Revert "build: create tmp/userids file"

LEDE Commits lede-commits at lists.infradead.org
Mon Sep 14 11:19:36 EDT 2020


jow pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/0b82ebaccbb4aa5033d0ea33b14027edd6dcafc0

commit 0b82ebaccbb4aa5033d0ea33b14027edd6dcafc0
Author: Jo-Philipp Wich <jo at mein.io>
AuthorDate: Mon Sep 14 16:16:59 2020 +0200

    Revert "build: create tmp/userids file"
    
    This reverts commit 34cc2c9a99f6542f009aa660790061f169aa96b3.
    
    The reverted shell code is a very poor reimplementation of the existing
    package-metadata.pl usergroup subcommand and the resulting file is not
    used anymore, so drop this code.
    
    Signed-off-by: Jo-Philipp Wich <jo at mein.io>
---
 include/toplevel.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/toplevel.mk b/include/toplevel.mk
index 5d872098db..c233a4c214 100644
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -93,7 +93,6 @@ prepare-tmpinfo: FORCE
 	./scripts/package-metadata.pl pkgaux tmp/.packageinfo > tmp/.packageauxvars || { rm -f tmp/.packageauxvars; false; }
 	./scripts/package-metadata.pl usergroup tmp/.packageinfo > tmp/.packageusergroup || { rm -f tmp/.packageusergroup; false; }
 	touch $(TOPDIR)/tmp/.build
-	grep "Require-User" tmp/.packageinfo | cut -d ' ' -f 2- | sort -u | grep "=" > tmp/userids
 
 .config: ./scripts/config/conf $(if $(CONFIG_HAVE_DOT_CONFIG),,prepare-tmpinfo)
 	@+if [ \! -e .config ] || ! grep CONFIG_HAVE_DOT_CONFIG .config >/dev/null; then \



More information about the lede-commits mailing list