From f997966f023c65750b763a87bcc73ced332caef6 Mon Sep 17 00:00:00 2001
From: Wynn Wolf Arbor
Date: Sun, 16 Feb 2020 11:07:42 +0100
Subject: Remove merge.sh

This functionality has been moved to another tool.
---
 merge.sh | 23 -----------------------
 1 file changed, 23 deletions(-)
 delete mode 100755 merge.sh

diff --git a/merge.sh b/merge.sh
deleted file mode 100755
index 69e3c37..0000000
--- a/merge.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-errx() {
-	printf "$@" >&2
-	exit 1
-}
-
-set -e
-
-host=${1:-$(hostname)}
-
-if ! test -r "kernfrag/templates/base"; then
-	errx "config: Could not find base template\n"
-fi
-
-if ! test -r "kernfrag/templates/$host"; then
-	errx "config: Could not find template for '%s'\n" "$host"
-fi
-
-printf "Starting merge for %s...\n\n" "$host"
-
-awk 'NF { printf "%s%s\0", "kernfrag/fragments/", $1 }' \
-	"kernfrag/templates/base" "kernfrag/templates/$host" | xargs -0 scripts/kconfig/merge_config.sh
-- 
cgit v1.2.3-2-gb3c3