domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools/quilt: fix build error during kernel_menuconfig on a cleaned env

Browse Source 
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 <mathieu@codeaurora.org>
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 47410
This commit is contained in:
Felix Fietkau
2015-11-07 12:52:14 +00:00
parent 279c8bee8d
commit bdbd0dce2e
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/quilt/patches/000-relocatable.patch
View File

@@ -7,10 +7,10 @@
-export TEXTDOMAINDIR=@LOCALEDIR@ -export TEXTDOMAINDIR=@LOCALEDIR@
-: ${QUILT_DIR=@QUILT_DIR@} -: ${QUILT_DIR=@QUILT_DIR@}
+if test -n "$STAGING_DIR"; then +if test -n "$STAGING_DIR_HOST"; then
+ export TEXTDOMAINDIR="$STAGING_DIR/../host/share/locale" + export TEXTDOMAINDIR="$STAGING_DIR_HOST/share/locale"
+ : ${QUILT_DIR=$STAGING_DIR/../host/share/quilt} ${QUILT_LIB=$STAGING_DIR/../host/lib/quilt} + : ${QUILT_DIR=$STAGING_DIR_HOST/share/quilt} ${QUILT_LIB=$STAGING_DIR_HOST/lib/quilt}
+ : ${QUILT_ETC=$STAGING_DIR/../host/etc} + : ${QUILT_ETC=$STAGING_DIR_HOST/etc}
+else +else
+ export TEXTDOMAINDIR=@LOCALEDIR@ + export TEXTDOMAINDIR=@LOCALEDIR@
+ : ${QUILT_DIR=@QUILT_DIR@} + : ${QUILT_DIR=@QUILT_DIR@}
@@ -41,7 +41,7 @@
setlocale(LC_MESSAGES, ""); setlocale(LC_MESSAGES, "");
-bindtextdomain("quilt", "@LOCALEDIR@"); -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"); textdomain("quilt");
sub _($) { sub _($) {
@@ -52,8 +52,8 @@
export TEXTDOMAIN=quilt export TEXTDOMAIN=quilt
-export TEXTDOMAINDIR=@LOCALEDIR@ -export TEXTDOMAINDIR=@LOCALEDIR@
+if [ -n "$STAGING_DIR" ]; then +if [ -n "$STAGING_DIR_HOST" ]; then
+ export TEXTDOMAINDIR="$STAGING_DIR/../host/share/locale" + export TEXTDOMAINDIR="$STAGING_DIR_HOST/share/locale"
+else +else
+ export TEXTDOMAINDIR=@LOCALEDIR@ + export TEXTDOMAINDIR=@LOCALEDIR@
+fi +fi
@@ -75,7 +75,7 @@
setlocale(LC_MESSAGES, ""); setlocale(LC_MESSAGES, "");
-bindtextdomain("quilt", "@LOCALEDIR@"); -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"); textdomain("quilt");
sub _($) { sub _($) {
@@ -119,8 +119,8 @@
} }
-: ${QUILT_DIR=@QUILT_DIR@} -: ${QUILT_DIR=@QUILT_DIR@}
+if test -n "$STAGING_DIR"; then +if test -n "$STAGING_DIR_HOST"; then
+ : ${QUILT_DIR="$STAGING_DIR/../host/share/quilt"} + : ${QUILT_DIR="$STAGING_DIR_HOST/share/quilt"}
+else +else
+ : ${QUILT_DIR=@QUILT_DIR@} + : ${QUILT_DIR=@QUILT_DIR@}
+fi +fi