From fec5566131a117848333cd2b64dea8aa42e871f7 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Mon, 22 Sep 2014 12:46:05 +0000 Subject: fixme: more bits --- strata/bsp-jetson-devel.morph | 4 +- strata/bsp-jetson-devel/jetson-linux.morph | 53 ++++++++++++++++++++++ strata/bsp-jetson-devel/linux.morph | 53 ---------------------- strata/genivi-smartdevicelink.morph | 38 +++++++--------- .../genivi-plusplus-system-armv7lhf-jetson.morph | 4 +- 5 files changed, 75 insertions(+), 77 deletions(-) create mode 100644 strata/bsp-jetson-devel/jetson-linux.morph delete mode 100644 strata/bsp-jetson-devel/linux.morph diff --git a/strata/bsp-jetson-devel.morph b/strata/bsp-jetson-devel.morph index 98bf8dad..5a4adb71 100644 --- a/strata/bsp-jetson-devel.morph +++ b/strata/bsp-jetson-devel.morph @@ -18,8 +18,8 @@ chunks: unpetrify-ref: baserock/arm/tegra-uboot-btrfs build-depends: - device-tree-compiler -- name: linux - morph: strata/bsp-jetson-devel/linux.morph +- name: jetson-linux + morph: strata/bsp-jetson-devel/jetson-linux.morph repo: upstream:linux ref: 4e9de37d16981f7c1b31feb41ff0e553ba489be0 unpetrify-ref: baserock/arm/tegra-3.10 diff --git a/strata/bsp-jetson-devel/jetson-linux.morph b/strata/bsp-jetson-devel/jetson-linux.morph new file mode 100644 index 00000000..1d3298e2 --- /dev/null +++ b/strata/bsp-jetson-devel/jetson-linux.morph @@ -0,0 +1,53 @@ +name: linux +kind: chunk +configure-commands: +- make ARCH=arm tegra_defconfig +- scripts/config -d KERNEL_LZO +- scripts/config -e KERNEL_GZIP +- scripts/config -e NAMESPACES +- scripts/config -e PACKET +- scripts/config -e SATA_AHCI +- scripts/config -e ATA_GENERIC +- scripts/config -e HAVE_IDE +- scripts/config -d BLK_DEV_IDE_SATA +- scripts/config -e BTRFS_FS +- scripts/config -e BTRFS_FS_POSIX_ACL +- scripts/config -e DEVTMPFS +- scripts/config -e DEVTMPFS_MOUNT +- scripts/config -e CONFIG_FHANDLE +- scripts/config -e CGROUPS +- scripts/config -e AUTOFS4_FS +- scripts/config --set-str UEVENT_HELPER_PATH '' +- scripts/config -e EXT2_FS +- scripts/config -e EXT2_FS_XATTR +- scripts/config -e EXT2_FS_POSIX_ACL +- scripts/config -e EXT2_FS_SECURITY +- scripts/config -e EXT2_FS_XIP +- scripts/config -e EXT3_FS +- scripts/config -d EXT3_DEFAULTS_TO_ORDERED +- scripts/config -e EXT3_FS_XATTR +- scripts/config -e EXT3_FS_POSIX_ACL +- scripts/config -e EXT3_FS_SECURITY +- scripts/config -e EXT4_FS +- scripts/config -e EXT4_FS_XATTR +- scripts/config -e EXT4_FS_POSIX_ACL +- scripts/config -e EXT4_FS_SECURITY +- scripts/config -d EXT4_DEBUG +- scripts/config -d JBD_DEBUG +- scripts/config -d JBD2_DEBUG +- scripts/config -e BLK_DEV_LOOP +- scripts/config -d BLK_DEV_CRYPTOLOOP +- scripts/config --set-val BLK_DEV_LOOP_MIN_COUNT 8 +- scripts/config -e IKCONFIG +- scripts/config -e IKCONFIG_PROC +- scripts/config -e SECCOMP +- scripts/config -d DEBUG_STACK_TRACE +- scripts/config -e NFSD +- scripts/config -e NFSD_V3 +- yes '' | make ARCH=arm oldconfig +build-commands: +- make $MAKEFLAGS ARCH=arm LOADADDR=0x80200000 zImage dtbs +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/. diff --git a/strata/bsp-jetson-devel/linux.morph b/strata/bsp-jetson-devel/linux.morph deleted file mode 100644 index 1d3298e2..00000000 --- a/strata/bsp-jetson-devel/linux.morph +++ /dev/null @@ -1,53 +0,0 @@ -name: linux -kind: chunk -configure-commands: -- make ARCH=arm tegra_defconfig -- scripts/config -d KERNEL_LZO -- scripts/config -e KERNEL_GZIP -- scripts/config -e NAMESPACES -- scripts/config -e PACKET -- scripts/config -e SATA_AHCI -- scripts/config -e ATA_GENERIC -- scripts/config -e HAVE_IDE -- scripts/config -d BLK_DEV_IDE_SATA -- scripts/config -e BTRFS_FS -- scripts/config -e BTRFS_FS_POSIX_ACL -- scripts/config -e DEVTMPFS -- scripts/config -e DEVTMPFS_MOUNT -- scripts/config -e CONFIG_FHANDLE -- scripts/config -e CGROUPS -- scripts/config -e AUTOFS4_FS -- scripts/config --set-str UEVENT_HELPER_PATH '' -- scripts/config -e EXT2_FS -- scripts/config -e EXT2_FS_XATTR -- scripts/config -e EXT2_FS_POSIX_ACL -- scripts/config -e EXT2_FS_SECURITY -- scripts/config -e EXT2_FS_XIP -- scripts/config -e EXT3_FS -- scripts/config -d EXT3_DEFAULTS_TO_ORDERED -- scripts/config -e EXT3_FS_XATTR -- scripts/config -e EXT3_FS_POSIX_ACL -- scripts/config -e EXT3_FS_SECURITY -- scripts/config -e EXT4_FS -- scripts/config -e EXT4_FS_XATTR -- scripts/config -e EXT4_FS_POSIX_ACL -- scripts/config -e EXT4_FS_SECURITY -- scripts/config -d EXT4_DEBUG -- scripts/config -d JBD_DEBUG -- scripts/config -d JBD2_DEBUG -- scripts/config -e BLK_DEV_LOOP -- scripts/config -d BLK_DEV_CRYPTOLOOP -- scripts/config --set-val BLK_DEV_LOOP_MIN_COUNT 8 -- scripts/config -e IKCONFIG -- scripts/config -e IKCONFIG_PROC -- scripts/config -e SECCOMP -- scripts/config -d DEBUG_STACK_TRACE -- scripts/config -e NFSD -- scripts/config -e NFSD_V3 -- yes '' | make ARCH=arm oldconfig -build-commands: -- make $MAKEFLAGS ARCH=arm LOADADDR=0x80200000 zImage dtbs -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/. diff --git a/strata/genivi-smartdevicelink.morph b/strata/genivi-smartdevicelink.morph index 4167077b..6dfb3496 100644 --- a/strata/genivi-smartdevicelink.morph +++ b/strata/genivi-smartdevicelink.morph @@ -1,17 +1,12 @@ +name: smartdevicelink kind: stratum -name: smartdevicelink description: Software for Smart Device Link by Ford build-depends: - - morph: strata/genivi-foundation.morph - - morph: strata/genivi.morph - - morph: strata/audio-bluetooth.morph - - morph: strata/qt5-tools-jetson.morph +- morph: strata/genivi-foundation.morph +- morph: strata/genivi.morph +- morph: strata/audio-bluetooth.morph +- morph: strata/qt5-tools-jetson.morph chunks: -#- name: libapr -# repo: upstream:libapr -# morph: strata/smartdevicelink/libapr.morph -# ref: 1.5.1 -# build-depends: [] - name: libapr-tarball repo: upstream:libapr-tarball ref: dea1efeb7f60fc6848e1e72b3fc973d0057565db @@ -24,15 +19,16 @@ chunks: unpetrify-ref: baserock/morph build-depends: - libapr-tarball -- name: log4cxx +- name: log4cxx repo: upstream:log4cxx - ref: master - build-depends: - - libapr-tarball - - libapr-util-tarball -- name: smartdevicelink - repo: upstream:smartdevicelink - morph: strata/genivi-smartdevicelink/smartdevicelink.morph - ref: 5a59c031430712fe270e72e8521866193c27fa56 - build-depends: - - log4cxx + ref: master + build-depends: + - libapr-tarball + - libapr-util-tarball +#- name: smartdevicelink +# morph: strata/genivi-smartdevicelink/smartdevicelink.morph +# repo: upstream:smartdevicelink +# ref: ct-mcr-1/danielsilverstone/jetson-genivi +# unpetrify-ref: 5a59c031430712fe270e72e8521866193c27fa56 +# build-depends: +# - log4cxx diff --git a/systems/genivi-plusplus-system-armv7lhf-jetson.morph b/systems/genivi-plusplus-system-armv7lhf-jetson.morph index 4180d66f..0b95d9cb 100644 --- a/systems/genivi-plusplus-system-armv7lhf-jetson.morph +++ b/systems/genivi-plusplus-system-armv7lhf-jetson.morph @@ -35,8 +35,10 @@ strata: morph: strata/weston-genivi.morph - name: qt5-tools-jetson morph: strata/qt5-tools-jetson.morph -- name: smartdevicelink +- name: genivi-smartdevicelink morph: strata/genivi-smartdevicelink.morph +- name: tools + morph: strata/tools.morph configuration-extensions: - set-hostname - add-config-files -- cgit v1.2.1