Author: nbd Date: 2015-11-07 13:52:14 +0100 (Sat, 07 Nov 2015) New Revision: 47410
Modified: trunk/tools/quilt/patches/000-relocatable.patch Log: tools/quilt: fix build error during kernel_menuconfig on a cleaned env When running "make kernel_menuconfig" right after "make clean", we error out with the following message: Makefile:22: recipe for target '.../build_dir/target-arm_cortex-a7_musl-1.1.10_eabi/linux-.../linux-3.18.18/.quilt_checked' failed make[2]: [.../build_dir/target-arm_cortex-a7_musl-1.1.10_eabi/linux-.../linux-3.18.18/.quilt_checked] Error 127 (ignored) The root cause of the problem is located in the OpenWrt specific quilt patch, which sets the quilt install directory to $STAGING_DIR/../host. However, on a clean environment (right after running "make clean"), $STAGING_DIR doesn't exist. The "quilt" executable doesn't find its different commands, errors out, and creates this message. We're fixing it by using $STAGING_DIR_HOST rather than $STAGING_DIR, which is absolute. It will work even if there is no target directory yet. Signed-off-by: Mathieu Olivari <[email protected]> Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/tools/quilt/patches/000-relocatable.patch =================================================================== --- trunk/tools/quilt/patches/000-relocatable.patch 2015-11-07 12:52:07 UTC (rev 47409) +++ trunk/tools/quilt/patches/000-relocatable.patch 2015-11-07 12:52:14 UTC (rev 47410) @@ -7,10 +7,10 @@ -export TEXTDOMAINDIR=@LOCALEDIR@ -: ${QUILT_DIR=@QUILT_DIR@} -+if test -n "$STAGING_DIR"; then -+ export TEXTDOMAINDIR="$STAGING_DIR/../host/share/locale" -+ : ${QUILT_DIR=$STAGING_DIR/../host/share/quilt} ${QUILT_LIB=$STAGING_DIR/../host/lib/quilt} -+ : ${QUILT_ETC=$STAGING_DIR/../host/etc} ++if test -n "$STAGING_DIR_HOST"; then ++ export TEXTDOMAINDIR="$STAGING_DIR_HOST/share/locale" ++ : ${QUILT_DIR=$STAGING_DIR_HOST/share/quilt} ${QUILT_LIB=$STAGING_DIR_HOST/lib/quilt} ++ : ${QUILT_ETC=$STAGING_DIR_HOST/etc} +else + export TEXTDOMAINDIR=@LOCALEDIR@ + : ${QUILT_DIR=@QUILT_DIR@} @@ -41,7 +41,7 @@ setlocale(LC_MESSAGES, ""); -bindtextdomain("quilt", "@LOCALEDIR@"); -+bindtextdomain("quilt", $ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/locale' : "@LOCALEDIR@"); ++bindtextdomain("quilt", $ENV{'STAGING_DIR_HOST'} ? $ENV{'STAGING_DIR_HOST'} . '/share/locale' : "@LOCALEDIR@"); textdomain("quilt"); sub _($) { @@ -52,8 +52,8 @@ export TEXTDOMAIN=quilt -export TEXTDOMAINDIR=@LOCALEDIR@ -+if [ -n "$STAGING_DIR" ]; then -+ export TEXTDOMAINDIR="$STAGING_DIR/../host/share/locale" ++if [ -n "$STAGING_DIR_HOST" ]; then ++ export TEXTDOMAINDIR="$STAGING_DIR_HOST/share/locale" +else + export TEXTDOMAINDIR=@LOCALEDIR@ +fi @@ -75,7 +75,7 @@ setlocale(LC_MESSAGES, ""); -bindtextdomain("quilt", "@LOCALEDIR@"); -+bindtextdomain("quilt", $ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/locale' : "@LOCALEDIR@"); ++bindtextdomain("quilt", $ENV{'STAGING_DIR_HOST'} ? $ENV{'STAGING_DIR_HOST'} . '/share/locale' : "@LOCALEDIR@"); textdomain("quilt"); sub _($) { @@ -119,8 +119,8 @@ } -: ${QUILT_DIR=@QUILT_DIR@} -+if test -n "$STAGING_DIR"; then -+ : ${QUILT_DIR="$STAGING_DIR/../host/share/quilt"} ++if test -n "$STAGING_DIR_HOST"; then ++ : ${QUILT_DIR="$STAGING_DIR_HOST/share/quilt"} +else + : ${QUILT_DIR=@QUILT_DIR@} +fi _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
