branding: add LEDE branding

Signed-off-by: John Crispin <blogic@openwrt.org>

7 files changed, 7 insertions, 13 deletions

diff --git a/scripts/brcmImage.pl b/scripts/brcmImage.pl
index 9a3acb43a4..265c1744bf 100755
--- a/scripts/brcmImage.pl
+++ b/scripts/brcmImage.pl
@@ -33,7 +33,7 @@ use Compress::Zlib;
 my $version = "0.1";
 my %arg = (
 	o => 'bcm963xx_fs_kernel',
-	b => 'OpenWrt',
+	b => 'LEDE',
 	c => '6348',
 	s => 64,
 	f => 0xbfc00000,
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 78053338c0..9858e62fbb 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -173,7 +173,7 @@ if ($tree) {
 	}
 
 	if (!defined $root) {
-		print "Must be run from the top-level dir. of a OpenWrt tree\n";
+		print "Must be run from the top-level dir. of a LEDE tree\n";
 		exit(2);
 	}
 }
diff --git a/scripts/config/mconf.c b/scripts/config/mconf.c
index 961c1cd457..f437dd7176 100644
--- a/scripts/config/mconf.c
+++ b/scripts/config/mconf.c
@@ -25,7 +25,7 @@
 static const char mconf_readme[] = N_(
 "Overview\n"
 "--------\n"
-"Some OpenWrt features may be built directly into the image.\n"
+"Some LEDE features may be built directly into the image.\n"
 "Some may be made into installable ipkg packages. Some features\n"
 "may be completely removed altogether.\n"
 "\n"
diff --git a/scripts/get_source_date_epoch.sh b/scripts/get_source_date_epoch.sh
index 436df9d064..ea8d930109 100755
--- a/scripts/get_source_date_epoch.sh
+++ b/scripts/get_source_date_epoch.sh
@@ -9,12 +9,6 @@ try_version() {
 	[ -n "$SOURCE_DATE_EPOCH" ]
 }
 
-try_svn() {
-	[ -d .svn ] || return 1
-	SOURCE_DATE_EPOCH="$(./scripts/portable_date.sh "$(LC_ALL=C svn info | sed -ne 's/^Last Changed Date: //p')" +%s)"
-	[ -n "$SOURCE_DATE_EPOCH" ]
-}
-
 try_git() {
 	[ -e .git ] || return 1
 	SOURCE_DATE_EPOCH="$(git log -1 --format=format:%ct)"
@@ -27,5 +21,5 @@ try_hg() {
 	[ -n "$SOURCE_DATE_EPOCH" ]
 }
 
-try_version || try_svn || try_git || try_hg || SOURCE_DATE_EPOCH=""
+try_version || try_git || try_hg || SOURCE_DATE_EPOCH=""
 echo "$SOURCE_DATE_EPOCH"
diff --git a/scripts/getver.sh b/scripts/getver.sh
index d3b68c8634..60adc42e92 100755
--- a/scripts/getver.sh
+++ b/scripts/getver.sh
@@ -11,7 +11,7 @@ try_version() {
 
 try_git() {
 	git rev-parse --git-dir >/dev/null 2>&1 || return 1
-	REV="$(git describe | sed "s/reboot-\([0-9]*\)-.*/\1/g")"
+	REV="$(git describe --match reboot | sed "s/reboot-\([0-9]*\)-.*/\1/g")"
 	[ -n "$REV" ]
 }
 
diff --git a/scripts/make-ipkg-dir.sh b/scripts/make-ipkg-dir.sh
index 902a4b526b..529e430ad9 100755
--- a/scripts/make-ipkg-dir.sh
+++ b/scripts/make-ipkg-dir.sh
@@ -10,7 +10,7 @@ WD=$(pwd)
 mkdir -p "$TARGET/CONTROL"
 grep '^[^(Version|Architecture)]' "$CONTROL" > "$TARGET/CONTROL/control"
 grep '^Maintainer' "$CONTROL" 2>&1 >/dev/null || \
-        echo "Maintainer: OpenWrt Developers Team <openwrt-devel@openwrt.org>" >> "$TARGET/CONTROL/control"
+        echo "Maintainer: LEDE Community <lede-dev@lists.infradead.org>" >> "$TARGET/CONTROL/control"
 grep '^Source' "$CONTROL" 2>&1 >/dev/null || {
         pkgbase=$(echo "$WD" | sed -e "s|^$TOPDIR/||g")
         [ "$pkgbase" = "$WD" ] && src="N/A" || src="$BASE/$pkgbase"
diff --git a/scripts/openbsd.sh b/scripts/openbsd.sh
index dc9f4f7780..dc88d28ed7 100644
--- a/scripts/openbsd.sh
+++ b/scripts/openbsd.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 ver=$(uname -r)
 arch=$(uname -m)
-echo "Preparing OpenBSD $arch $ver for OpenWrt"
+echo "Preparing OpenBSD $arch $ver for LEDE"
 PKG_PATH="http://ftp.openbsd.org/pub/OpenBSD/${ver}/packages/${arch}/"
 export PKG_PATH
 pkg_add -v gmake