diff --git a/scripts/sync-fragment.sh b/scripts/sync-fragment.sh index ace2823667..5e0e3b07ca 100755 --- a/scripts/sync-fragment.sh +++ b/scripts/sync-fragment.sh @@ -25,23 +25,25 @@ if [ ! -f .config ]; then exit 1 fi -BASE_DEFCONFIG=`sed -n "/CONFIG_BASE_DEFCONFIG=/s/CONFIG_BASE_DEFCONFIG=//p" .config | tr -d '\r' | tr -d '"'` -if [ -z "${BASE_DEFCONFIG}" ]; then - echo "ERROR: No base defconfig assigned by BASE_DEFCONFIG=..." +BASE_DEFCONFIG1=`sed -n "/CONFIG_BASE_DEFCONFIG=/s/CONFIG_BASE_DEFCONFIG=//p" .config | tr -d '\r' | tr -d '"'` +if [ -z "${BASE_DEFCONFIG1}" ]; then + echo "ERROR: No base defconfig assigned by BASE_DEFCONFIG1=..." exit 1 fi -if [ ! -f configs/${BASE_DEFCONFIG} ]; then - echo "ERROR: No base defconfig \"${BASE_DEFCONFIG}\"" +if [ ! -f configs/${BASE_DEFCONFIG1} ]; then + echo "ERROR: No base defconfig \"${BASE_DEFCONFIG1}\"" exit 1 fi +BASE_DEFCONFIG0=`sed -n "/CONFIG_BASE_DEFCONFIG=/s/CONFIG_BASE_DEFCONFIG=//p" configs/${BASE_DEFCONFIG1} | tr -d '\r' | tr -d '"'` + if [ ! -f ${FRAGMENT_CONFIG} ]; then MSG_NEW_FILE="New config fragment: ${FRAGMENT_CONFIG}" fi cp .config fragment.config -make ${BASE_DEFCONFIG} +make ${BASE_DEFCONFIG0} ${BASE_DEFCONFIG1} ./scripts/diffconfig -m .config fragment.config | sort > ${FRAGMENT_CONFIG} cp fragment.config .config