summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Thomas <james.thomas@codethink.co.uk>2014-10-03 16:54:47 (GMT)
committerJames Thomas <james.thomas@codethink.co.uk>2014-10-03 16:54:47 (GMT)
commit8399037d70ce2563bbbe80ab4c88589c37453a97 (patch)
tree7e60bab353a3581c33a40a70b9e2ec11446899ee
parent5125d70f96e713f3dd379ff54ef170451e41b2be (diff)
downloaddefinitions-8399037d70ce2563bbbe80ab4c88589c37453a97.tar.gz
Upgrade components
Build kernel modules Don't strip gplv3
-rw-r--r--strata/bsp-jetson-devel.morph7
-rw-r--r--strata/bsp-jetson-devel/jetson-linux.morph20
-rw-r--r--strata/weston-genivi.morph8
-rw-r--r--systems/genivi-plusplus-system-armv7lhf-jetson.morph1
4 files changed, 29 insertions, 7 deletions
diff --git a/strata/bsp-jetson-devel.morph b/strata/bsp-jetson-devel.morph
index 497fd18..5904b44 100644
--- a/strata/bsp-jetson-devel.morph
+++ b/strata/bsp-jetson-devel.morph
@@ -31,3 +31,10 @@ chunks:
ref: 19bc31ce3198a3c19cdd96d392bde34cb34ed525
unpetrify-ref: baserock/arm/tegra-3.10
build-depends: []
+- name: nouveau-drm
+ morph: strata/bsp-jetson-devel/nouveau-drm.morph
+ repo: upstream:nouveau
+ ref: 62d1f5d2f5b3e5122eeac0f763dcdd1d04bf5c45
+ unpetrify-ref: gk20a
+ build-depends:
+ - jetson-linux
diff --git a/strata/bsp-jetson-devel/jetson-linux.morph b/strata/bsp-jetson-devel/jetson-linux.morph
index 0550736..bff6374 100644
--- a/strata/bsp-jetson-devel/jetson-linux.morph
+++ b/strata/bsp-jetson-devel/jetson-linux.morph
@@ -44,8 +44,8 @@ configure-commands:
- scripts/config -d DEBUG_STACK_TRACE
- scripts/config -e NFSD
- scripts/config -e NFSD_V3
-- scripts/config -e CONFIG_DRM_NOUVEAU
-- scripts/config -e CONFIG_DRM_TEGRA_STAGING
+- scripts/config -e DRM_TEGRA_STAGING
+- scripts/config -m DRM_NOUVEAU
- yes '' | make ARCH=arm oldconfig
build-commands:
- make $MAKEFLAGS ARCH=arm LOADADDR=0x80200000 zImage dtbs
@@ -53,3 +53,19 @@ install-commands:
- mkdir -p "$DESTDIR"/boot
- cp arch/arm/boot/zImage "$DESTDIR"/boot/zImage
- cp arch/arm/boot/dts/tegra124-jetson-tk1.dtb "$DESTDIR"/boot/.
+- make modules
+- make INSTALL_MOD_PATH="$DESTDIR" modules_install
+- install -d "$DESTDIR$PREFIX/src/linux"
+- |
+ (
+ printf 'Makefile\0'
+ printf 'Module.symvers\0'
+ find arch/arm -maxdepth 1 -name 'Makefile*' -print0
+ find arch/arm \( -name 'module.lds' -o -name 'Kbuild.platforms' -o -name 'Platform' \) -print0
+ find arch/arm \( -type d -a \( -name include -o -name scripts \) \) -o \
+ \! -type d -a \( -path '*include/*' -o -path '*scripts/*' \) -print0
+ find include -name 'asm*' -prune -o -print0
+ find include/asm-generic -print0
+ find include/uapi -print0
+ find scripts -print0
+ ) | cpio -0pumd "$DESTDIR$PREFIX/src/linux"
diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph
index 1354399..19b95fd 100644
--- a/strata/weston-genivi.morph
+++ b/strata/weston-genivi.morph
@@ -14,14 +14,14 @@ chunks:
- name: weston
morph: strata/weston-genivi/weston.morph
repo: upstream:weston
- ref: ct-mcr-1/danielsilverstone/jetson-genivi
- unpetrify-ref: 8658e06e69cc3944e89684a2de619e479751633f
+ ref: 5d9e9c1393c6b0ea6ce52912fc458c963e644547
+ unpetrify-ref: baserock/genivi/1.2.0
build-depends:
- linux-pam
- name: wayland-ivi-extension
morph: strata/weston-genivi/wayland-ivi-extension.morph
repo: upstream:genivi/wayland-ivi-extension
- ref: ct-mcr-1/danielsilverstone/jetson-genivi
- unpetrify-ref: 8b59529cf3b279a948f253bc79263d00d3f051a5
+ ref: 633ce4f89f695c575bdfc080551b0e59c8287427
+ unpetrify-ref: baserock/genivi/1.2.0
build-depends:
- weston
diff --git a/systems/genivi-plusplus-system-armv7lhf-jetson.morph b/systems/genivi-plusplus-system-armv7lhf-jetson.morph
index 0b95d9c..c516483 100644
--- a/systems/genivi-plusplus-system-armv7lhf-jetson.morph
+++ b/systems/genivi-plusplus-system-armv7lhf-jetson.morph
@@ -45,5 +45,4 @@ configuration-extensions:
- simple-network
- nfsboot
- install-files
-- strip-gplv3
- fstab