From patchwork Mon Jan 25 11:48:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1431164 X-Patchwork-Delegate: freifunk@adrianschmutzler.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=G5naAmeb; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DPSs81Ksmz9sVX for ; Mon, 25 Jan 2021 22:52:12 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=TjENh3k9tRD/C7/1D1cwDpC0nVXtEAvzokdSMQnKW4U=; b=G5naAmebGQg+Ne+7juZk29R/D+ OahxFrHquIjW8i/o4B9rYZaSj5/GUd9AYNp6SO+dO9oYaXWrnKISebViREDAXQXEWVPrejJsrb6br PIodf+MuCH0iVqN6v67vj3+2g3M7BGvSTAeJ29Hhl2iwEyv0lkYoG6Pv7cIFLCyG1gq4c0MUrrws/ pHOoHB4efhAliOJuAAxu4Qbg9Ri9OrneOh3z1YZJQNoucDxwIOoGaXaIt32Wa38yw/Wu2jtv5arGj UJygOswZt9Ulh0yAvefwK7N+iA6lU5LME0zDSnW2PLM340FNYHIitWUf+mOvJtq6bytaKzsf2BwFm UEn85pLw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l40NJ-0002na-77; Mon, 25 Jan 2021 11:49:41 +0000 Received: from mout.kundenserver.de ([212.227.126.130]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l40NE-0002mR-Mt for openwrt-devel@lists.openwrt.org; Mon, 25 Jan 2021 11:49:38 +0000 Received: from buildfff.adridolf.com ([178.26.242.49]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M5wc7-1l5vNo0uc7-007Y8j for ; Mon, 25 Jan 2021 12:49:31 +0100 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH 1/2] treewide: drop shebang from non-executable lib files Date: Mon, 25 Jan 2021 12:48:42 +0100 Message-Id: <20210125114843.2210-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:4pwhztpMwJZEKRtt+sW2f2N3wwnoeZ76VBqacF9XzWilKQ+AzM4 rkbik/A955FSQrC5p2AiL3uUJz8zv5vyUeCDAcUmRDCKWQgB1unM/y3OLe8pnrXj/9W8bA3 ufse8A0WWtRV425nxbYwn4wfhbxQoE0xnvcQ835+vS11CazKdGqtJJ/DHiwXrEZ3eyrntJa WPaoIqKFEYiGC5VAIPbkg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:dCiPoVx+/DY=:C2KAe0WLcxypOEON5B1aJ4 GGk62/l9X7hyWYY2DNR3Hxreo3kCc8EyqkHy0cP5kMHPSPzC6ZkP/UxtZXilHTjCzcEhg/fJ3 amf/IQl7T4GwAKI5oX62gWWj5kCNEqGKlb6jCZTwVpxKaINA3pkEOt1F0ySrpTZgwXXtG/6Zd JzCRdo63bziHNrGZgVpeYeAsFA4/a9s2TRnMlz6tgKuD0Uq+A084vdqfNuSFmY6NausnDNWN5 6Fc0wFFiY0JGEq0fCMLinAt5gjLtZoMmanq1cOxnmGrVvqARfIhQ+Nay+lnckQniXlOc1CHAE lN3SiEn3K1sAS1Rm0vS+DR9vVpCRnLpPnMZuaoFm/HNaFaZ5Z4zlVTiKpVoVkp7henWN+Dwjf 6IruvDKiNmNRKaqoKnAunX1uJKm8ujfExFh32yE4U5W/Sr2bnY68S+/E8kGTob72w/dk/QH34 WSRdNe2IYA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210125_064936_945571_3CD43D30 X-CRM114-Status: GOOD ( 11.78 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.130 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.126.130 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This drops the shebang from another bunch of files in various /lib folders, as these are sourced and the shebang is useless. Fix execute bit in one case, too. This should cover almost all trivial cases now, i.e. where /lib is actually used for library files. Signed-off-by: Adrian Schmutzler --- package/base-files/files/lib/functions/leds.sh | 1 - package/base-files/files/lib/functions/migrations.sh | 2 -- package/base-files/files/lib/functions/preinit.sh | 1 - package/base-files/files/lib/functions/uci-defaults.sh | 2 -- package/base-files/files/lib/preinit/02_default_set_state | 2 -- package/base-files/files/lib/preinit/10_indicate_failsafe | 1 - package/base-files/files/lib/preinit/10_indicate_preinit | 1 - package/base-files/files/lib/preinit/30_failsafe_wait | 1 - package/base-files/files/lib/preinit/40_run_failsafe_hook | 1 - .../base-files/files/lib/preinit/50_indicate_regular_preinit | 1 - package/base-files/files/lib/preinit/70_initramfs_test | 1 - package/base-files/files/lib/preinit/80_mount_root | 1 - package/base-files/files/lib/preinit/99_10_failsafe_login | 1 - package/base-files/files/lib/preinit/99_10_run_init | 1 - package/base-files/files/lib/upgrade/common.sh | 2 -- package/base-files/files/lib/upgrade/nand.sh | 1 - package/system/uci/Makefile | 2 +- package/system/uci/files/lib/config/uci.sh | 1 - package/system/urandom-seed/Makefile | 2 +- package/system/urandom-seed/files/lib/preinit/81_urandom_seed | 2 -- .../lantiq/base-files/lib/preinit/05_set_preinit_iface_lantiq | 3 --- .../mediatek/mt7622/base-files/lib/preinit/79_move_config | 2 -- target/linux/tegra/base-files/lib/preinit/79_move_config | 3 --- 23 files changed, 2 insertions(+), 33 deletions(-) mode change 100755 => 100644 package/base-files/files/lib/functions/uci-defaults.sh diff --git a/package/base-files/files/lib/functions/leds.sh b/package/base-files/files/lib/functions/leds.sh index 14baeb37b4..a7532faa2f 100644 --- a/package/base-files/files/lib/functions/leds.sh +++ b/package/base-files/files/lib/functions/leds.sh @@ -1,4 +1,3 @@ -#!/bin/sh # Copyright (C) 2013 OpenWrt.org get_dt_led_path() { diff --git a/package/base-files/files/lib/functions/migrations.sh b/package/base-files/files/lib/functions/migrations.sh index d2f1bc19aa..d43ea35051 100644 --- a/package/base-files/files/lib/functions/migrations.sh +++ b/package/base-files/files/lib/functions/migrations.sh @@ -1,5 +1,3 @@ -#!/bin/sh - . /lib/functions.sh migrate_led_sysfs() { diff --git a/package/base-files/files/lib/functions/preinit.sh b/package/base-files/files/lib/functions/preinit.sh index 57862a11f3..591e810af9 100644 --- a/package/base-files/files/lib/functions/preinit.sh +++ b/package/base-files/files/lib/functions/preinit.sh @@ -1,4 +1,3 @@ -#!/bin/sh # Copyright (C) 2006-2013 OpenWrt.org # Copyright (C) 2010 Vertical Communications diff --git a/package/base-files/files/lib/functions/uci-defaults.sh b/package/base-files/files/lib/functions/uci-defaults.sh old mode 100755 new mode 100644 index 2f50cd6bfd..134c527d8d --- a/package/base-files/files/lib/functions/uci-defaults.sh +++ b/package/base-files/files/lib/functions/uci-defaults.sh @@ -1,5 +1,3 @@ -#!/bin/ash - . /lib/functions.sh . /usr/share/libubox/jshn.sh diff --git a/package/base-files/files/lib/preinit/02_default_set_state b/package/base-files/files/lib/preinit/02_default_set_state index df43395726..28d5f1d9f9 100644 --- a/package/base-files/files/lib/preinit/02_default_set_state +++ b/package/base-files/files/lib/preinit/02_default_set_state @@ -1,5 +1,3 @@ -#!/bin/sh - define_default_set_state() { . /etc/diag.sh } diff --git a/package/base-files/files/lib/preinit/10_indicate_failsafe b/package/base-files/files/lib/preinit/10_indicate_failsafe index 27b94c140f..7bf5e029e4 100644 --- a/package/base-files/files/lib/preinit/10_indicate_failsafe +++ b/package/base-files/files/lib/preinit/10_indicate_failsafe @@ -1,4 +1,3 @@ -#!/bin/sh # Copyright (C) 2006 OpenWrt.org # Copyright (C) 2010 Vertical Communications diff --git a/package/base-files/files/lib/preinit/10_indicate_preinit b/package/base-files/files/lib/preinit/10_indicate_preinit index 423c425223..3c59929790 100644 --- a/package/base-files/files/lib/preinit/10_indicate_preinit +++ b/package/base-files/files/lib/preinit/10_indicate_preinit @@ -1,4 +1,3 @@ -#!/bin/sh # Copyright (C) 2006 OpenWrt.org # Copyright (C) 2010 Vertical Communications diff --git a/package/base-files/files/lib/preinit/30_failsafe_wait b/package/base-files/files/lib/preinit/30_failsafe_wait index a2c2c386aa..f90de71d40 100644 --- a/package/base-files/files/lib/preinit/30_failsafe_wait +++ b/package/base-files/files/lib/preinit/30_failsafe_wait @@ -1,4 +1,3 @@ -#!/bin/sh # Copyright (C) 2006-2010 OpenWrt.org # Copyright (C) 2010 Vertical Communications diff --git a/package/base-files/files/lib/preinit/40_run_failsafe_hook b/package/base-files/files/lib/preinit/40_run_failsafe_hook index 533b0a9771..e3f769a858 100644 --- a/package/base-files/files/lib/preinit/40_run_failsafe_hook +++ b/package/base-files/files/lib/preinit/40_run_failsafe_hook @@ -1,4 +1,3 @@ -#!/bin/sh # Copyright (C) 2006-2010 OpenWrt.org # Copyright (C) 2010 Vertical Communications diff --git a/package/base-files/files/lib/preinit/50_indicate_regular_preinit b/package/base-files/files/lib/preinit/50_indicate_regular_preinit index 5b7523f6fd..f4afcddb44 100644 --- a/package/base-files/files/lib/preinit/50_indicate_regular_preinit +++ b/package/base-files/files/lib/preinit/50_indicate_regular_preinit @@ -1,4 +1,3 @@ -#!/bin/sh # Copyright (C) 2006 OpenWrt.org # Copyright (C) 2010 Vertical Communications diff --git a/package/base-files/files/lib/preinit/70_initramfs_test b/package/base-files/files/lib/preinit/70_initramfs_test index 8504e34db0..c5aae983c7 100644 --- a/package/base-files/files/lib/preinit/70_initramfs_test +++ b/package/base-files/files/lib/preinit/70_initramfs_test @@ -1,4 +1,3 @@ -#!/bin/sh # Copyright (C) 2006 OpenWrt.org # Copyright (C) 2010 Vertical Communications diff --git a/package/base-files/files/lib/preinit/80_mount_root b/package/base-files/files/lib/preinit/80_mount_root index a15c972220..3f75411a43 100644 --- a/package/base-files/files/lib/preinit/80_mount_root +++ b/package/base-files/files/lib/preinit/80_mount_root @@ -1,4 +1,3 @@ -#!/bin/sh # Copyright (C) 2006 OpenWrt.org # Copyright (C) 2010 Vertical Communications diff --git a/package/base-files/files/lib/preinit/99_10_failsafe_login b/package/base-files/files/lib/preinit/99_10_failsafe_login index 16ad84f4ba..1410c5f0db 100644 --- a/package/base-files/files/lib/preinit/99_10_failsafe_login +++ b/package/base-files/files/lib/preinit/99_10_failsafe_login @@ -1,4 +1,3 @@ -#!/bin/sh # Copyright (C) 2006-2015 OpenWrt.org # Copyright (C) 2010 Vertical Communications diff --git a/package/base-files/files/lib/preinit/99_10_run_init b/package/base-files/files/lib/preinit/99_10_run_init index b4f0ec203d..ebf77b0896 100644 --- a/package/base-files/files/lib/preinit/99_10_run_init +++ b/package/base-files/files/lib/preinit/99_10_run_init @@ -1,4 +1,3 @@ -#!/bin/sh # Copyright (C) 2006 OpenWrt.org # Copyright (C) 2010 Vertical Communications diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index c28bae48a1..968893e226 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -1,5 +1,3 @@ -#!/bin/sh - RAM_ROOT=/tmp/root export BACKUP_FILE=sysupgrade.tgz # file extracted by preinit diff --git a/package/base-files/files/lib/upgrade/nand.sh b/package/base-files/files/lib/upgrade/nand.sh index ad04bbc753..e6f58df4f5 100644 --- a/package/base-files/files/lib/upgrade/nand.sh +++ b/package/base-files/files/lib/upgrade/nand.sh @@ -1,4 +1,3 @@ -#!/bin/sh # Copyright (C) 2014 OpenWrt.org # diff --git a/package/system/uci/Makefile b/package/system/uci/Makefile index 4f77cf2219..fca800a541 100644 --- a/package/system/uci/Makefile +++ b/package/system/uci/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uci -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE_URL=$(PROJECT_GIT)/project/uci.git PKG_SOURCE_PROTO:=git diff --git a/package/system/uci/files/lib/config/uci.sh b/package/system/uci/files/lib/config/uci.sh index 1e85ced834..8d32cd1743 100644 --- a/package/system/uci/files/lib/config/uci.sh +++ b/package/system/uci/files/lib/config/uci.sh @@ -1,4 +1,3 @@ -#!/bin/sh # Shell script compatibility wrappers for /sbin/uci # # Copyright (C) 2008-2010 OpenWrt.org diff --git a/package/system/urandom-seed/Makefile b/package/system/urandom-seed/Makefile index 7cb7c72038..7c5524a9db 100644 --- a/package/system/urandom-seed/Makefile +++ b/package/system/urandom-seed/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=urandom-seed -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_LICENSE:=GPL-2.0-only include $(INCLUDE_DIR)/package.mk diff --git a/package/system/urandom-seed/files/lib/preinit/81_urandom_seed b/package/system/urandom-seed/files/lib/preinit/81_urandom_seed index 26212c60b5..2adc6c47f0 100644 --- a/package/system/urandom-seed/files/lib/preinit/81_urandom_seed +++ b/package/system/urandom-seed/files/lib/preinit/81_urandom_seed @@ -1,5 +1,3 @@ -#!/bin/sh - log_urandom_seed() { echo "urandom-seed: $1" > /dev/kmsg } diff --git a/target/linux/lantiq/base-files/lib/preinit/05_set_preinit_iface_lantiq b/target/linux/lantiq/base-files/lib/preinit/05_set_preinit_iface_lantiq index 4f7dc6673c..5f059ee974 100644 --- a/target/linux/lantiq/base-files/lib/preinit/05_set_preinit_iface_lantiq +++ b/target/linux/lantiq/base-files/lib/preinit/05_set_preinit_iface_lantiq @@ -1,8 +1,5 @@ -#!/bin/sh - set_preinit_iface() { ifname=eth0 } boot_hook_add preinit_main set_preinit_iface - diff --git a/target/linux/mediatek/mt7622/base-files/lib/preinit/79_move_config b/target/linux/mediatek/mt7622/base-files/lib/preinit/79_move_config index 865a5fb90c..8a30b84497 100644 --- a/target/linux/mediatek/mt7622/base-files/lib/preinit/79_move_config +++ b/target/linux/mediatek/mt7622/base-files/lib/preinit/79_move_config @@ -1,5 +1,3 @@ -#!/bin/sh - . /lib/upgrade/common.sh RECOVERY_PART=/dev/mmcblk0p6 diff --git a/target/linux/tegra/base-files/lib/preinit/79_move_config b/target/linux/tegra/base-files/lib/preinit/79_move_config index d17e734ac8..ff1c7c1ed7 100644 --- a/target/linux/tegra/base-files/lib/preinit/79_move_config +++ b/target/linux/tegra/base-files/lib/preinit/79_move_config @@ -1,5 +1,3 @@ -#!/bin/sh - move_config() { local partdev @@ -19,4 +17,3 @@ move_config() { } boot_hook_add preinit_mount_root move_config -