Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Port to Pyro #122

Merged
merged 11 commits into from Oct 24, 2017
Merged

Port to Pyro #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f37c840
poky: Update to Pyro
Sep 5, 2017
bf856fc
meta-openembedded: Update to Pyro
Sep 5, 2017
e100cf9
meta-raspberrypi: Update to Pyro
Sep 5, 2017
3eaaaa8
oe-meta-go: Remove after Pyro upgrade
Sep 5, 2017
172027a
meta-rust: Update to Pyro
Sep 27, 2017
f30df9a
bblayers.conf.sample: Switch to Pyro layers
Sep 5, 2017
75a6d5d
local.conf.sample: Add docker to HOSTTOOLS
Sep 5, 2017
75d0b54
layer.conf: Remove references to i2s-mmap
Sep 5, 2017
7ebf954
layer.conf: Update list of overlays
Sep 8, 2017
b1e4b81
Update Yocto version in coffeescript
Sep 20, 2017
a684065
CHANGELOG.md: Add entry for Pyro update
Sep 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitmodules
View file
Open in desktop
Expand Up @@ -13,9 +13,6 @@
[submodule "resin-yocto-scripts"]
path = resin-yocto-scripts
url = https://github.com/resin-os/resin-yocto-scripts.git
[submodule "layers/oe-meta-go"]
path = layers/oe-meta-go
url = https://github.com/mem/oe-meta-go.git
[submodule "tests/autohat"]
path = tests/autohat
url = https://github.com/resin-io/autohat.git
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
@@ -1,6 +1,7 @@
Change log
-----------

* Update layers to Yocto Pyro [Will]
* Update meta-openembedded to latest morty branch [Will]
* Update poky to latest morty branch [Will]

Expand Down
2 changes: 1 addition & 1 deletion layers/meta-openembedded
Open in desktop
Submodule meta-openembedded updated 1812 files
2 changes: 1 addition & 1 deletion layers/meta-raspberrypi
Open in desktop
Submodule meta-raspberrypi updated from 28d440 to 829175
27 changes: 20 additions & 7 deletions layers/meta-resin-raspberrypi/conf/layer.conf
View file
Open in desktop
Expand Up @@ -14,35 +14,47 @@ BBFILE_PRIORITY_resin-raspberrypi = "1337"
# They have been renamed to match rpi-base.inc.
KERNEL_DEVICETREE_append = " \
overlays/adau1977-adc.dtbo \
overlays/adau7002-simple.dtbo \
overlays/ads1015.dtbo \
overlays/ads1115.dtbo \
overlays/ads7846.dtbo \
overlays/akkordion-iqdacplus.dtbo \
overlays/allo-boss-dac-pcm512x-audio.dtbo \
overlays/allo-digione.dtbo \
overlays/allo-piano-dac-pcm512x-audio.dtbo \
overlays/allo-piano-dac-plus-pcm512x-audio.dtbo \
overlays/at86rf233.dtbo \
overlays/audioinjector-addons.dtbo \
overlays/audioinjector-wm8731-audio.dtbo \
overlays/audremap.dtbo \
overlays/bmp085_i2c-sensor.dtbo \
overlays/dht11.dtbo \
overlays/dionaudio-loco.dtbo \
overlays/dionaudio-loco-v2.dtbo \
overlays/dpi18.dtbo \
overlays/dpi24.dtbo \
overlays/dwc2.dtbo \
overlays/dwc-otg.dtbo \
overlays/enc28j60.dtbo \
overlays/enc28j60-spi2.dtbo \
overlays/fe-pi-audio.dtbo \
overlays/goodix.dtbo \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very nice!

overlays/googlevoicehat-soundcard.dtbo \
overlays/gpio-ir.dtbo \
overlays/gpio-poweroff.dtbo \
overlays/gpio-shutdown.dtbo \
overlays/hifiberry-digi-pro.dtbo \
overlays/hy28a.dtbo \
overlays/hy28b.dtbo \
overlays/i2c0-bcm2708.dtbo \
overlays/i2c1-bcm2708.dtbo \
overlays/i2c-bcm2708.dtbo \
overlays/i2c-gpio.dtbo \
overlays/i2c-mux.dtbo \
overlays/i2c-pwm-pca9685a.dtbo \
overlays/i2c-rtc-gpio.dtbo \
overlays/i2c-sensor.dtbo \
overlays/i2s-gpio28-31.dtbo \
overlays/i2s-mmap.dtbo \
overlays/iqaudio-digi-wm8804-audio.dtbo \
overlays/justboom-dac.dtbo \
overlays/justboom-digi.dtbo \
Expand All @@ -51,24 +63,30 @@ KERNEL_DEVICETREE_append = " \
overlays/mcp2515-can0.dtbo \
overlays/mcp2515-can1.dtbo \
overlays/mcp3008.dtbo \
overlays/midi-uart0.dtbo \
overlays/midi-uart1.dtbo \
overlays/mmc.dtbo \
overlays/mpu6050.dtbo \
overlays/mz61581.dtbo \
overlays/papirus.dtbo \
overlays/pi3-act-led.dtbo \
overlays/pi3-disable-wifi.dtbo \
overlays/piscreen2r.dtbo \
overlays/piscreen.dtbo \
overlays/pisound.dtbo \
overlays/pitft28-capacitive.dtbo \
overlays/pitft35-resistive.dtbo \
overlays/pwm-2chan.dtbo \
overlays/pwm.dtbo \
overlays/qca7000.dtbo \
overlays/raspidac3.dtbo \
overlays/rotary-encoder.dtbo \
overlays/rpi-backlight.dtbo \
overlays/rpi-cirrus-wm5102.dtbo \
overlays/rpi-dac.dtbo \
overlays/rpi-display.dtbo \
overlays/rpi-proto.dtbo \
overlays/rpi-sense.dtbo \
overlays/rpi-tv.dtbo \
overlays/rra-digidac1-wm8741-audio.dtbo \
overlays/sc16is750-i2c.dtbo \
overlays/sc16is752-spi1.dtbo \
Expand Down Expand Up @@ -96,10 +114,5 @@ KERNEL_DEVICETREE_append = " \
overlays/wittypi.dtbo \
"

# XXX
# Ugly hack - the 4.9 Kernel, on which RaspberryPi 3 64 is, doesn't provide
# i2s-mmap anymore
KERNEL_DEVICETREE_remove_raspberrypi3-64 = "overlays/i2s-mmap.dtbo"

# We use udev rules to create serial device aliases
SERIAL_CONSOLE = "115200 serial0"
5 changes: 2 additions & 3 deletions layers/meta-resin-raspberrypi/conf/samples/bblayers.conf.sample
View file
Open in desktop
Expand Up @@ -14,15 +14,14 @@ BBLAYERS ?= " \
${TOPDIR}/../layers/meta-openembedded/meta-python \
${TOPDIR}/../layers/meta-raspberrypi \
${TOPDIR}/../layers/meta-resin/meta-resin-common \
${TOPDIR}/../layers/meta-resin/meta-resin-morty \
${TOPDIR}/../layers/meta-resin/meta-resin-pyro \
${TOPDIR}/../layers/meta-resin-raspberrypi \
${TOPDIR}/../layers/meta-rust \
${TOPDIR}/../layers/oe-meta-go \
"

BBLAYERS_NON_REMOVABLE ?= " \
${TOPDIR}/../layers/poky/meta \
${TOPDIR}/../layers/poky/meta-poky \
${TOPDIR}/../layers/meta-resin/meta-resin-common \
${TOPDIR}/../layers/meta-resin/meta-resin-morty \
${TOPDIR}/../layers/meta-resin/meta-resin-pyro \
"
2 changes: 2 additions & 0 deletions layers/meta-resin-raspberrypi/conf/samples/local.conf.sample
View file
Open in desktop
Expand Up @@ -62,3 +62,5 @@ BB_DISKMON_DIRS = "\
ABORT,${SSTATE_DIR},100M,1K"

CONF_VERSION = "1"

HOSTTOOLS += "docker iptables"
2 changes: 1 addition & 1 deletion layers/meta-rust
Open in desktop
Submodule meta-rust updated 25 files
+2 −2 Jenkinsfile
+4 −5 classes/rust-bin.bbclass
+3 −3 classes/rust-common.bbclass
+2 −2 classes/rust.bbclass
+1 −1 conf/local.conf.sample
+2 −2 lib/crate.py
+0 −86 recipes-devtools/cargo/cargo_0.13.0.bb
+0 −28 recipes-devtools/rust/compiler-rt.inc
+0 −2 recipes-devtools/rust/compiler-rt_1.12.1.bb
+0 −107 recipes-devtools/rust/files/rust-1.12.1/0001-Target-add-default-target.json-path-libdir-rust-targ.patch
+0 −73 recipes-devtools/rust/files/rust-1.12.1/0002-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch
+0 −27 recipes-devtools/rust/files/rust-1.12.1/0003-mk-add-missing-CFG_LIBDIR_RELATIVE.patch
+0 −25 recipes-devtools/rust/files/rust-1.12.1/0005-std-thread_local-workaround-for-NULL-__dso_handle.patch
+0 −30 recipes-devtools/rust/files/rust-1.12.1/0006-mk-install-use-disable-rewrite-paths.patch
+0 −65 recipes-devtools/rust/files/rust-1.12.1/0007-Allow-overriding-crate_hash-with-C-crate_hash.patch
+0 −27 recipes-devtools/rust/files/rust-1.12.1/0008-mk-platform.mk-pass-C-crate_hash-to-builds.patch
+0 −58 recipes-devtools/rust/files/rust-installer-1.12.1/0001-add-option-to-disable-rewriting-of-install-paths.patch
+0 −11 recipes-devtools/rust/libstd-rs_1.12.1.bb
+0 −2 recipes-devtools/rust/rust-cross_1.12.1.bb
+1 −47 recipes-devtools/rust/rust-llvm.inc
+0 −16 recipes-devtools/rust/rust-llvm_1.12.1.bb
+2 −0 recipes-devtools/rust/rust-llvm_1.15.1.bb
+0 −25 recipes-devtools/rust/rust-source-1.12.1.inc
+26 −26 recipes-devtools/rust/rust.inc
+0 −27 recipes-devtools/rust/rust_1.12.1.bb
1 change: 0 additions & 1 deletion layers/oe-meta-go
Open in desktop
Submodule oe-meta-go deleted from a15be4
2 changes: 1 addition & 1 deletion layers/poky
Open in desktop
Submodule poky updated from 1d92cb to 50cc15
2 changes: 1 addition & 1 deletion raspberrypi.coffee
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@ module.exports =
machine: 'raspberrypi'
image: 'resin-image'
fstype: 'resinos-img'
version: 'yocto-morty'
version: 'yocto-pyro'
deployArtifact: 'resin-image-raspberrypi.resinos-img'
compressed: true

Expand Down
2 changes: 1 addition & 1 deletion raspberrypi2.coffee
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@ module.exports =
machine: 'raspberrypi2'
image: 'resin-image'
fstype: 'resinos-img'
version: 'yocto-morty'
version: 'yocto-pyro'
deployArtifact: 'resin-image-raspberrypi2.resinos-img'
compressed: true

Expand Down
2 changes: 1 addition & 1 deletion raspberrypi3-64.coffee
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@ module.exports =
machine: 'raspberrypi3-64'
image: 'resin-image'
fstype: 'resinos-img'
version: 'yocto-morty'
version: 'yocto-pyro'
deployArtifact: 'resin-image-raspberrypi3-64.resinos-img'
compressed: true

Expand Down
2 changes: 1 addition & 1 deletion raspberrypi3.coffee
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@ module.exports =
machine: 'raspberrypi3'
image: 'resin-image'
fstype: 'resinos-img'
version: 'yocto-morty'
version: 'yocto-pyro'
deployArtifact: 'resin-image-raspberrypi3.resinos-img'
compressed: true

Expand Down