Merge pull request #94 from sixtyfourktec/linux

jkloetzke · web-flow · commit 61eedab0fb25 · 2025-06-03T21:48:34.000+02:00
classes/linux: fixes for -dtbs/-kmod-dist
diff --git a/classes/linux/dtbs.yaml b/classes/linux/dtbs.yaml
@@ -13,6 +13,7 @@ buildSetup: |
         makeParallel ${1:-dtbs} "${@:2}"
     }
 
+packageVars: [LINUX_ARCH]
 packageSetup: |
     # Install the device tree files.
     #
@@ -22,7 +23,7 @@ packageSetup: |
     #       are installed
     linuxInstallDtbs()
     {
-        if [[ -n "${2:-}" ]]; then
+        if [[ ! "${2+set}" ]]; then
             if [[ -d "$1/arch/$LINUX_ARCH/boot/dts" ]] ; then
                 make -C "$1" INSTALL_DTBS_PATH="$PWD" dtbs_install
             fi
diff --git a/classes/linux/kmod-dist.yaml b/classes/linux/kmod-dist.yaml
@@ -1,5 +1,6 @@
 inherit: [linux]
 
+packageVars: [LINUX_ARCH]
 packageSetup: |
     _SCRIPT_DIR=$1/kmod-script
 

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ buildSetup: \|`
`13`	`13`	`makeParallel ${1:-dtbs} "${@:2}"`
`14`	`14`	`}`
`15`	`15`
	`16`	`+packageVars: [LINUX_ARCH]`
`16`	`17`	`packageSetup: \|`
`17`	`18`	`# Install the device tree files.`
`18`	`19`	`#`
`@@ -22,7 +23,7 @@ packageSetup: \|`
`22`	`23`	`# are installed`
`23`	`24`	`linuxInstallDtbs()`
`24`	`25`	`{`
`25`		`- if [[ -n "${2:-}" ]]; then`
	`26`	`+ if [[ ! "${2+set}" ]]; then`
`26`	`27`	`if [[ -d "$1/arch/$LINUX_ARCH/boot/dts" ]] ; then`
`27`	`28`	`make -C "$1" INSTALL_DTBS_PATH="$PWD" dtbs_install`
`28`	`29`	`fi`