Skip to content

Commit

Permalink
Merge pull request #44 from vermaete/master
Browse files Browse the repository at this point in the history
opendds 3.28.0 -> 3.28.1
  • Loading branch information
jrw972 authored May 13, 2024
2 parents 9b580b2 + 6baf486 commit 7de0819
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 64 deletions.
6 changes: 3 additions & 3 deletions kas/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ Building
cd meta-opendds
kas build kas/rpi.yaml:kas/opendds.yaml; # Just OpenDDS for RPi
kas build kas/rpi.yaml:kas/opendds.yaml:kas/ishapes.yaml; # iShapes demo
kas build kas/rpi.yaml:kas/opendds.yaml:kas/ptests.yaml; # OpenDDS with Yocto ptests
kas build kas/rpi.yaml:kas/opendds.yaml:kas/ptest.yaml; # OpenDDS with Yocto ptests
```

### Qemu

```
cd meta-opendds
kas build kas/qemu.yaml:kas/opendds.yaml;
kas build kas/qemu.yaml:kas/opendds.yaml:kas/ptests.yaml; # OpenDDS with Yocto ptests
kas build kas/qemu.yaml:kas/opendds.yaml:kas/ptest.yaml; # OpenDDS with Yocto ptests
```

Deploying
Expand Down Expand Up @@ -76,7 +76,7 @@ A detailed log of the run can be found on the `/tmp` of the device.
#### Start QEMU

```
kas sheel kas/qemu.yaml:kas/opendds.yaml:kas/ptests.yaml
kas shell kas/qemu.yaml:kas/opendds.yaml:kas/ptest.yaml
cd tmp/deploy/images/qemux86-64
runqemu core-image-minimal-qemux86-64.rootfs.qemuboot.conf qemux86-64 nographic
```
Expand Down
2 changes: 1 addition & 1 deletion kas/qemu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@ local_conf_header:
DISTRO_FEATURES:append = " systemd usrmerge"
VIRTUAL-RUNTIME_init_manager = "systemd"
qemu: |
QB_MEM = "-m 4096"
QB_MEM = "-m 8192"

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@ SRC_URI = "\
git://github.com/OpenDDS/OpenDDS.git;protocol=https;branch=${DDS_SRC_BRANCH};name=opendds \
${@bb.utils.contains('PACKAGECONFIG', 'doc-group3', '${DOC_TAO3_URI};name=ace_tao;unpack=0;subdir=git', '${DOC_TAO2_URI};name=ace_tao;unpack=0;subdir=git', d)} \
${@bb.utils.contains('PACKAGECONFIG', 'ishapes', 'file://0001-adding-the-ishapes-demo.patch', '', d)} \
file://0002-gov-gen-uses-openssl-API-incorrectly.patch \
file://0010-WIP-test-filter-tests-that-should-not-run-on-the-tar.patch \
"

require opendds.inc

SRCREV = "27ebd797b830c3b6426087d1398e580ca4f74780"
SRCREV = "802922c55923db381e0a55f6e435186b60946964"
SRC_URI[ace_tao.sha256sum] = "${@bb.utils.contains('PACKAGECONFIG', 'doc-group3', '${DOC_TAO3_SHA256SUM}', '${DOC_TAO2_SHA256SUM}', d)}"

0 comments on commit 7de0819

Please sign in to comment.