threeeye
bc1d038eac
Squashed backup commit (no shallow-clone history issues) of xiaomi-mt6833-dev/kernel_xiaomi_mt6833 (lineage-23.2 branch, upstream commit 9eece662e) plus all fixes applied to get everpal_defconfig building clean against a modern (GCC 15.2.0) toolchain -- see the previous commit message on the lineage-23.2 branch (also in this repo history is not available here since this is a squashed snapshot; full incremental history lives in the local DL380 checkout and the upstream GitHub remote). Upstream: https://github.com/xiaomi-mt6833-dev/kernel_xiaomi_mt6833 (lineage-23.2)
62 lines
1.4 KiB
Bash
Executable File
62 lines
1.4 KiB
Bash
Executable File
#!/bin/bash
|
|
#
|
|
# config_override.sh base override
|
|
#
|
|
# Combines base and override, removing any Kconfig options from base
|
|
# that conflict with any in override, concatenating what remains and
|
|
# sending the result to standard output.
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 2 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, you can access it online at
|
|
# http://www.gnu.org/licenses/gpl-2.0.html.
|
|
#
|
|
# Copyright (C) IBM Corporation, 2017
|
|
#
|
|
# Authors: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
|
|
|
|
base=$1
|
|
if test -r $base
|
|
then
|
|
:
|
|
else
|
|
echo Base file $base unreadable!!!
|
|
exit 1
|
|
fi
|
|
|
|
override=$2
|
|
if test -r $override
|
|
then
|
|
:
|
|
else
|
|
echo Override file $override unreadable!!!
|
|
exit 1
|
|
fi
|
|
|
|
T=/tmp/config_override.sh.$$
|
|
trap 'rm -rf $T' 0
|
|
mkdir $T
|
|
|
|
sed < $override -e 's/^/grep -v "/' -e 's/=.*$/="/' |
|
|
awk '
|
|
{
|
|
if (last)
|
|
print last " |";
|
|
last = $0;
|
|
}
|
|
END {
|
|
if (last)
|
|
print last;
|
|
}' > $T/script
|
|
sh $T/script < $base
|
|
cat $override
|