diff mbox series

package/environment-setup: add better kernel handling

Message ID 20201109165803.2415518-1-angelo@amarulasolutions.com
State Accepted
Headers show
Series package/environment-setup: add better kernel handling | expand

Commit Message

Angelo Compagnucci Nov. 9, 2020, 4:58 p.m. UTC
Exporting ARCH and KERNELDIR makes easier to compile an external kernel
or out of tree kernel modules.

Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com>
---
 package/environment-setup/environment-setup    | 1 +
 package/environment-setup/environment-setup.mk | 5 +++++
 2 files changed, 6 insertions(+)

Comments

Matt Weber Nov. 10, 2020, 2:56 p.m. UTC | #1
Angelo,


On Mon, Nov 9, 2020 at 11:00 AM Angelo Compagnucci
<angelo@amarulasolutions.com> wrote:
>
> Exporting ARCH and KERNELDIR makes easier to compile an external kernel
> or out of tree kernel modules.
>
> Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com>

Reviewed-by: Matt Weber <matthew.weber@rockwellcollins.com>
Arnout Vandecappelle Dec. 1, 2020, 8:53 p.m. UTC | #2
On 09/11/2020 17:58, Angelo Compagnucci wrote:
> Exporting ARCH and KERNELDIR makes easier to compile an external kernel
> or out of tree kernel modules.
> 
> Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com>

 Applied to next, thanks.

 Regards,
 Arnout

> ---
>  package/environment-setup/environment-setup    | 1 +
>  package/environment-setup/environment-setup.mk | 5 +++++
>  2 files changed, 6 insertions(+)
> 
> diff --git a/package/environment-setup/environment-setup b/package/environment-setup/environment-setup
> index 813aa01c7a..e9bc36fdd0 100644
> --- a/package/environment-setup/environment-setup
> +++ b/package/environment-setup/environment-setup
> @@ -10,6 +10,7 @@ cat <<'EOF'
>  Some tips:
>  * PATH now contains the SDK utilities
>  * Standard autotools variables (CC, LD, CFLAGS) are exported
> +* Kernel compilation variables (ARCH, CROSS_COMPILE, KERNELDIR) are exported
>  * To configure do "./configure $CONFIGURE_FLAGS" or use
>    the "configure" alias
>  * To build CMake-based projects, use the "cmake" alias
> diff --git a/package/environment-setup/environment-setup.mk b/package/environment-setup/environment-setup.mk
> index fb87c6f0b7..fcad013f0d 100644
> --- a/package/environment-setup/environment-setup.mk
> +++ b/package/environment-setup/environment-setup.mk
> @@ -11,6 +11,7 @@ define HOST_ENVIRONMENT_SETUP_INSTALL_CMDS
>  	for var in $(TARGET_CONFIGURE_OPTS); do \
>  		printf "export \"$$var\"\n" >> $(ENVIRONMENT_SETUP_FILE); \
>  	done
> +	printf "export \"ARCH=$(KERNEL_ARCH)\"\n" >> $(ENVIRONMENT_SETUP_FILE)
>  	printf "export \"CROSS_COMPILE=$(TARGET_CROSS)\"\n" >> $(ENVIRONMENT_SETUP_FILE)
>  	printf "export \"CONFIGURE_FLAGS=--target=$(GNU_TARGET_NAME) \
>  		--host=$(GNU_TARGET_NAME) \
> @@ -31,6 +32,10 @@ define HOST_ENVIRONMENT_SETUP_INSTALL_CMDS
>  		$(ENVIRONMENT_SETUP_FILE)
>  	printf "export \"PATH=\$$SDK_PATH/bin:\$$SDK_PATH/sbin:\$$PATH\"\n" \
>  		>> $(ENVIRONMENT_SETUP_FILE)
> +
> +	$(if $(BR2_LINUX_KERNEL),\
> +		printf "export \"KERNELDIR=$(LINUX_BUILDDIR)\"\n" \
> +			>> $(ENVIRONMENT_SETUP_FILE),)
>  endef
>  
>  $(eval $(host-generic-package))
>
diff mbox series

Patch

diff --git a/package/environment-setup/environment-setup b/package/environment-setup/environment-setup
index 813aa01c7a..e9bc36fdd0 100644
--- a/package/environment-setup/environment-setup
+++ b/package/environment-setup/environment-setup
@@ -10,6 +10,7 @@  cat <<'EOF'
 Some tips:
 * PATH now contains the SDK utilities
 * Standard autotools variables (CC, LD, CFLAGS) are exported
+* Kernel compilation variables (ARCH, CROSS_COMPILE, KERNELDIR) are exported
 * To configure do "./configure $CONFIGURE_FLAGS" or use
   the "configure" alias
 * To build CMake-based projects, use the "cmake" alias
diff --git a/package/environment-setup/environment-setup.mk b/package/environment-setup/environment-setup.mk
index fb87c6f0b7..fcad013f0d 100644
--- a/package/environment-setup/environment-setup.mk
+++ b/package/environment-setup/environment-setup.mk
@@ -11,6 +11,7 @@  define HOST_ENVIRONMENT_SETUP_INSTALL_CMDS
 	for var in $(TARGET_CONFIGURE_OPTS); do \
 		printf "export \"$$var\"\n" >> $(ENVIRONMENT_SETUP_FILE); \
 	done
+	printf "export \"ARCH=$(KERNEL_ARCH)\"\n" >> $(ENVIRONMENT_SETUP_FILE)
 	printf "export \"CROSS_COMPILE=$(TARGET_CROSS)\"\n" >> $(ENVIRONMENT_SETUP_FILE)
 	printf "export \"CONFIGURE_FLAGS=--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
@@ -31,6 +32,10 @@  define HOST_ENVIRONMENT_SETUP_INSTALL_CMDS
 		$(ENVIRONMENT_SETUP_FILE)
 	printf "export \"PATH=\$$SDK_PATH/bin:\$$SDK_PATH/sbin:\$$PATH\"\n" \
 		>> $(ENVIRONMENT_SETUP_FILE)
+
+	$(if $(BR2_LINUX_KERNEL),\
+		printf "export \"KERNELDIR=$(LINUX_BUILDDIR)\"\n" \
+			>> $(ENVIRONMENT_SETUP_FILE),)
 endef
 
 $(eval $(host-generic-package))