build,userspace: set correct path to the kernel when building userspace/

71ea77ab · Tomasz Wlostowski · cabe6e89 · 71ea77ab · 71ea77ab
Commit 71ea77ab authored Jun 21, 2012 by Tomasz Wlostowski
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

wrs_build_userspace build/scripts/wrs_build_userspace +2 -0

Makefile userspace/Makefile +0 -1

No files found.
--- a/build/scripts/wrs_build_userspace
+++ b/build/scripts/wrs_build_userspace
@@ -19,6 +19,8 @@ mkdir -p $installdir || wrs_die "mkdir images/wr"

 # This time build is done in-place, but the output is a tree in images/wr.
 # Some of the makefiles inside use 
+export LINUX="$WRS_OUTPUT_DIR/build/linux-2.6.39"
+
 cd $sourcedir && make

 # mini-rpc is an external package, it has no wr-specific install

--- a/userspace/Makefile
+++ b/userspace/Makefile
@@ -3,7 +3,6 @@
 # in the auto-generated ../Makedefs (when software was in svn).
 # So let's add all of the needed variables here (environment can override)

-LINUX ?= $(WRDEV_DIR)/software/rubi-repos/linux-wr
 ARCH ?= arm
 CROSS_COMPILE ?= $(CROSS_COMPILE_ARM_PATH)$(CROSS_COMPILE_ARM_PREFIX)
 CROSS_COMPILE_ARM ?= $(CROSS_COMPILE)