Skip to content

Commit 496df4a

Browse files
matt2005matt2005
authored
Update with latest dev (#532)
* Added fixes for pi2 * pi2 fixes for duplicate config.txt entries * Added workflow to add pi2 image * added fix for pi2 qt * added dependabot fix * added typo fix * updated prebuilts ref * added missing prerun * fixed img hashes * fix .img.md5
1 parent f9ac0fd commit 496df4a

File tree

16 files changed

+237
-26
lines changed

16 files changed

+237
-26
lines changed

‎.github/workflows/crankshaft.yml‎

Lines changed: 114 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,14 @@ jobs:
2323
sha1_filename: ${{ steps.get-artifact-name.outputs.sha1_filename }}
2424
sha256_path: ${{ steps.get-artifact-name.outputs.sha256_path }}
2525
sha256_filename: ${{ steps.get-artifact-name.outputs.sha256_filename }}
26+
pi2_artifact_path: ${{ steps.get-artifact-name.outputs.artifact_path }}
27+
pi2_artifact_filename: ${{ steps.get-artifact-name-pi2.outputs.artifact_filename }}
28+
pi2_md5_path: ${{ steps.get-artifact-name-pi2.outputs.md5_path }}
29+
pi2_md5_filename: ${{ steps.get-artifact-name-pi2.outputs.md5_filename }}
30+
pi2_sha1_path: ${{ steps.get-artifact-name-pi2.outputs.sha1_path }}
31+
pi2_sha1_filename: ${{ steps.get-artifact-name-pi2.outputs.sha1_filename }}
32+
pi2_sha256_path: ${{ steps.get-artifact-name-pi2.outputs.sha256_path }}
33+
pi2_sha256_filename: ${{ steps.get-artifact-name-pi2.outputs.sha256_filename }}
2634
version: ${{ steps.get_version.outputs.version }}
2735
builddate: ${{ steps.get_version.outputs.builddate }}
2836
steps:
@@ -88,21 +96,42 @@ jobs:
8896
name: Get Name of Artifact
8997
id: get-artifact-name
9098
run: |
91-
ls -hla
92-
ARTIFACT_PATHNAME=$(ls ./deploy/*.zip | head -n 1)
99+
ls -hla deploy/*
100+
ARTIFACT_PATHNAME=$(ls deploy/*[!-pi2].zip | head -n 1)
93101
ARTIFACT_NAME=$(basename $ARTIFACT_PATHNAME)
102+
MD5_PATHNAME=$(ls deploy/*[!-pi2].img.md5 | head -n 1)
103+
MD5_NAME=$(basename $MD5_PATHNAME)
104+
SHA1_PATHNAME=$(ls deploy/*[!-pi2].sha1 | head -n 1)
105+
SHA1_NAME=$(basename $SHA1_PATHNAME)
106+
SHA256_PATHNAME=$(ls deploy/*[!-pi2].sha256 | head -n 1)
107+
SHA256_NAME=$(basename $SHA256_PATHNAME)
94108
echo ::set-output name=artifact_filename::${ARTIFACT_NAME}
95109
echo ::set-output name=artifact_path::${ARTIFACT_PATHNAME}
96-
MD5_PATHNAME=$(ls ./deploy/*.md5 | head -n 1)
97-
MD5_NAME=$(basename $MD5_PATHNAME)
98110
echo ::set-output name=md5_filename::${MD5_NAME}
99111
echo ::set-output name=md5_path::${MD5_PATHNAME}
100-
SHA1_PATHNAME=$(ls ./deploy/*.sha1 | head -n 1)
101-
SHA1_NAME=$(basename $SHA1_PATHNAME)
102112
echo ::set-output name=sha1_filename::${SHA1_NAME}
103113
echo ::set-output name=sha1_path::${SHA1_PATHNAME}
104-
SHA256_PATHNAME=$(ls ./deploy/*.sha256 | head -n 1)
114+
echo ::set-output name=sha256_filename::${SHA256_NAME}
115+
echo ::set-output name=sha256_path::${SHA256_PATHNAME}
116+
-
117+
name: Get Name of Artifact - pi2
118+
id: get-artifact-name-pi2
119+
run: |
120+
ls -hla deploy/*
121+
ARTIFACT_PATHNAME=$(ls deploy/*[-pi2].zip | head -n 1)
122+
ARTIFACT_NAME=$(basename $ARTIFACT_PATHNAME)
123+
MD5_PATHNAME=$(ls deploy/*[-pi2].img.md5 | head -n 1)
124+
MD5_NAME=$(basename $MD5_PATHNAME)
125+
SHA1_PATHNAME=$(ls deploy/*[-pi2].sha1 | head -n 1)
126+
SHA1_NAME=$(basename $SHA1_PATHNAME)
127+
SHA256_PATHNAME=$(ls deploy/*[-pi2].sha256 | head -n 1)
105128
SHA256_NAME=$(basename $SHA256_PATHNAME)
129+
echo ::set-output name=artifact_filename::${ARTIFACT_NAME}
130+
echo ::set-output name=artifact_path::${ARTIFACT_PATHNAME}
131+
echo ::set-output name=md5_filename::${MD5_NAME}
132+
echo ::set-output name=md5_path::${MD5_PATHNAME}
133+
echo ::set-output name=sha1_filename::${SHA1_NAME}
134+
echo ::set-output name=sha1_path::${SHA1_PATHNAME}
106135
echo ::set-output name=sha256_filename::${SHA256_NAME}
107136
echo ::set-output name=sha256_path::${SHA256_PATHNAME}
108137
-
@@ -116,6 +145,10 @@ jobs:
116145
${{ steps.get-artifact-name.outputs.md5_path }}
117146
${{ steps.get-artifact-name.outputs.sha1_path }}
118147
${{ steps.get-artifact-name.outputs.sha256_path }}
148+
${{ steps.get-artifact-name-pi2.outputs.artifact_path }}
149+
${{ steps.get-artifact-name-pi2.outputs.md5_path }}
150+
${{ steps.get-artifact-name-pi2.outputs.sha1_path }}
151+
${{ steps.get-artifact-name-pi2.outputs.sha256_path }}
119152
./pi-gen/deploy/build.log
120153
release:
121154
name: Create release
@@ -144,21 +177,42 @@ jobs:
144177
name: Get Name of Artifact
145178
id: get-artifact-name
146179
run: |
147-
ls -hla
148-
ARTIFACT_PATHNAME=$(ls deploy/*.zip | head -n 1)
180+
ls -hla deploy/*
181+
ARTIFACT_PATHNAME=$(ls deploy/*[!-pi2].zip | head -n 1)
149182
ARTIFACT_NAME=$(basename $ARTIFACT_PATHNAME)
183+
MD5_PATHNAME=$(ls deploy/*[!-pi2].img.md5 | head -n 1)
184+
MD5_NAME=$(basename $MD5_PATHNAME)
185+
SHA1_PATHNAME=$(ls deploy/*[!-pi2].sha1 | head -n 1)
186+
SHA1_NAME=$(basename $SHA1_PATHNAME)
187+
SHA256_PATHNAME=$(ls deploy/*[!-pi2].sha256 | head -n 1)
188+
SHA256_NAME=$(basename $SHA256_PATHNAME)
150189
echo ::set-output name=artifact_filename::${ARTIFACT_NAME}
151190
echo ::set-output name=artifact_path::${ARTIFACT_PATHNAME}
152-
MD5_PATHNAME=$(ls deploy/*.md5 | head -n 1)
153-
MD5_NAME=$(basename $MD5_PATHNAME)
154191
echo ::set-output name=md5_filename::${MD5_NAME}
155192
echo ::set-output name=md5_path::${MD5_PATHNAME}
156-
SHA1_PATHNAME=$(ls deploy/*.sha1 | head -n 1)
157-
SHA1_NAME=$(basename $SHA1_PATHNAME)
158193
echo ::set-output name=sha1_filename::${SHA1_NAME}
159194
echo ::set-output name=sha1_path::${SHA1_PATHNAME}
160-
SHA256_PATHNAME=$(ls deploy/*.sha256 | head -n 1)
195+
echo ::set-output name=sha256_filename::${SHA256_NAME}
196+
echo ::set-output name=sha256_path::${SHA256_PATHNAME}
197+
-
198+
name: Get Name of Artifact - pi2
199+
id: get-artifact-name-pi2
200+
run: |
201+
ls -hla deploy/*
202+
ARTIFACT_PATHNAME=$(ls deploy/*[-pi2].zip | head -n 1)
203+
ARTIFACT_NAME=$(basename $ARTIFACT_PATHNAME)
204+
MD5_PATHNAME=$(ls deploy/*[-pi2].img.md5 | head -n 1)
205+
MD5_NAME=$(basename $MD5_PATHNAME)
206+
SHA1_PATHNAME=$(ls deploy/*[-pi2].sha1 | head -n 1)
207+
SHA1_NAME=$(basename $SHA1_PATHNAME)
208+
SHA256_PATHNAME=$(ls deploy/*[-pi2].sha256 | head -n 1)
161209
SHA256_NAME=$(basename $SHA256_PATHNAME)
210+
echo ::set-output name=artifact_filename::${ARTIFACT_NAME}
211+
echo ::set-output name=artifact_path::${ARTIFACT_PATHNAME}
212+
echo ::set-output name=md5_filename::${MD5_NAME}
213+
echo ::set-output name=md5_path::${MD5_PATHNAME}
214+
echo ::set-output name=sha1_filename::${SHA1_NAME}
215+
echo ::set-output name=sha1_path::${SHA1_PATHNAME}
162216
echo ::set-output name=sha256_filename::${SHA256_NAME}
163217
echo ::set-output name=sha256_path::${SHA256_PATHNAME}
164218
-
@@ -172,9 +226,20 @@ jobs:
172226
asset_path: ${{ steps.get-artifact-name.outputs.artifact_path }}
173227
asset_name: ${{ steps.get-artifact-name.outputs.artifact_filename }}
174228
asset_content_type: application/zip
229+
-
230+
name: Upload Release Asset -pi2
231+
id: upload-release-asset-pi2
232+
uses: actions/upload-release-asset@v1.0.2
233+
env:
234+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
235+
with:
236+
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
237+
asset_path: ${{ steps.get-artifact-name-pi2.outputs.artifact_path }}
238+
asset_name: ${{ steps.get-artifact-name-pi2.outputs.artifact_filename }}
239+
asset_content_type: application/zip
175240
-
176241
name: Upload Release MD5
177-
id: upload-release-md5
242+
id: upload-release-md5
178243
uses: actions/upload-release-asset@v1.0.2
179244
env:
180245
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -183,6 +248,17 @@ jobs:
183248
asset_path: ${{ steps.get-artifact-name.outputs.md5_path }}
184249
asset_name: ${{ steps.get-artifact-name.outputs.md5_filename }}
185250
asset_content_type: text/plain
251+
-
252+
name: Upload Release MD5 -pi2
253+
id: upload-release-md5-pi2
254+
uses: actions/upload-release-asset@v1.0.2
255+
env:
256+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
257+
with:
258+
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
259+
asset_path: ${{ steps.get-artifact-name-pi2.outputs.md5_path }}
260+
asset_name: ${{ steps.get-artifact-name-pi2.outputs.md5_filename }}
261+
asset_content_type: text/plain
186262
-
187263
name: Upload Release SHA1
188264
id: upload-release-sha1
@@ -194,9 +270,20 @@ jobs:
194270
asset_path: ${{ steps.get-artifact-name.outputs.sha1_path }}
195271
asset_name: ${{ steps.get-artifact-name.outputs.sha1_filename }}
196272
asset_content_type: text/plain
273+
-
274+
name: Upload Release SHA1 -pi2
275+
id: upload-release-sha1-pi2
276+
uses: actions/upload-release-asset@v1.0.2
277+
env:
278+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
279+
with:
280+
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
281+
asset_path: ${{ steps.get-artifact-name-pi2.outputs.sha1_path }}
282+
asset_name: ${{ steps.get-artifact-name-pi2.outputs.sha1_filename }}
283+
asset_content_type: text/plain
197284
-
198285
name: Upload Release SHA256
199-
id: upload-release-SHA256
286+
id: upload-release-SHA256
200287
uses: actions/upload-release-asset@v1.0.2
201288
env:
202289
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -205,3 +292,14 @@ jobs:
205292
asset_path: ${{ steps.get-artifact-name.outputs.sha256_path }}
206293
asset_name: ${{ steps.get-artifact-name.outputs.sha256_filename }}
207294
asset_content_type: text/plain
295+
-
296+
name: Upload Release SHA256 -pi2
297+
id: upload-release-SHA256-pi2
298+
uses: actions/upload-release-asset@v1.0.2
299+
env:
300+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
301+
with:
302+
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
303+
asset_path: ${{ steps.get-artifact-name-pi2.outputs.sha256_path }}
304+
asset_name: ${{ steps.get-artifact-name-pi2.outputs.sha256_filename }}
305+
asset_content_type: text/plain

‎.github/workflows/pifile.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ jobs:
130130
-
131131
name: Build Changelog
132132
id: github_release
133-
uses: mikepenz/release-changelog-builder-action@v2.7.2
133+
uses: mikepenz/release-changelog-builder-action@v2.8.2
134134
env:
135135
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
136136
-

‎export-image/04-finalise/01-run.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ mkdir -p "${DEPLOY_DIR}"
8989
rm -f "${DEPLOY_DIR}/${ZIP_FILENAME}${IMG_SUFFIX}.zip"
9090
rm -f "${DEPLOY_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.img"
9191
pushd "${STAGE_WORK_DIR}" > /dev/null
92-
MD5HASH="${STAGE_WORK_DIR}/${IMG_FILENAME}.img.md5"
93-
SHA1HASH="${STAGE_WORK_DIR}/${IMG_FILENAME}.sha1"
94-
SHA256HASH="${STAGE_WORK_DIR}/${IMG_FILENAME}.sha256"
92+
MD5HASH="${STAGE_WORK_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.img.md5"
93+
SHA1HASH="${STAGE_WORK_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.sha1"
94+
SHA256HASH="${STAGE_WORK_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.sha256"
9595
md5sum "$(basename "${IMG_FILE}")" > "$(basename "${MD5HASH}")"
9696
sha1sum "$(basename "${IMG_FILE}")" > "$(basename "${SHA1HASH}")"
9797
sha256sum "$(basename "${IMG_FILE}")" > "$(basename "${SHA256HASH}")"

‎prebuilts‎

‎stage3/03-crankshaft-base/01-run.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/bash -e
22

33
# /boot
4+
install -m 644 files/boot/config.txt "${ROOTFS_DIR}/boot/"
45
install -d "${ROOTFS_DIR}/boot/crankshaft"
56
install -m 644 files/boot/crankshaft/gpio2kbd.cfg "${ROOTFS_DIR}/boot/crankshaft/"
67
install -m 644 files/boot/crankshaft/openauto.ini "${ROOTFS_DIR}/boot/crankshaft/"

‎stage3/03-crankshaft-base/02-run-chroot.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ echo "start_cd=1" >> /boot/config.txt
4949
echo "#dtoverlay=sdtweak,overclock_50=100" >> /boot/config.txt
5050

5151
# enable vc4 for rpi3 as well
52-
sed -i 's/#dtoverlay=vc4-fkms-v3d/dtoverlay=vc4-fkms-v3d/' /boot/config.txt
52+
#sed -i 's/#dtoverlay=vc4-fkms-v3d/dtoverlay=vc4-fkms-v3d/' /boot/config.txt
5353

5454
# pulseaudio
5555
cat /etc/pulse/csng_daemon.conf >> /etc/pulse/daemon.conf

‎stage3/03-crankshaft-base/07-run-chroot.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash -e
2+
# fix Pi2 eglfs on Buster
3+
ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so
4+
ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so
5+
ln -s /opt/vc/lib/libbrcmOpenVG.so /usr/lib/arm-linux-gnueabihf/libOpenVG.so
6+
ln -s /opt/vc/lib/libbrcmWFC.so /usr/lib/arm-linux-gnueabihf/libWFC.so

‎stage3/03-crankshaft-base/files/boot/config.txt‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
# For more options and information see
2+
# http://rpf.io/configtxt
3+
# Some settings may impact device functionality. See link above for details
4+
5+
# uncomment if you get no picture on HDMI for a default "safe" mode
6+
#hdmi_safe=1
7+
8+
# uncomment this if your display has a black border of unused pixels visible
9+
# and your display can output without overscan
10+
#disable_overscan=1
11+
12+
# uncomment the following to adjust overscan. Use positive numbers if console
13+
# goes off screen, and negative if there is too much border
14+
#overscan_left=16
15+
#overscan_right=16
16+
#overscan_top=16
17+
#overscan_bottom=16
18+
19+
# uncomment to force a console size. By default it will be display's size minus
20+
# overscan.
21+
#framebuffer_width=1280
22+
#framebuffer_height=720
23+
24+
# uncomment if hdmi display is not detected and composite is being output
25+
#hdmi_force_hotplug=1
26+
27+
# uncomment to force a specific HDMI mode (this will force VGA)
28+
#hdmi_group=1
29+
#hdmi_mode=1
30+
31+
# uncomment to force a HDMI mode rather than DVI. This can make audio work in
32+
# DMT (computer monitor) modes
33+
#hdmi_drive=2
34+
35+
# uncomment to increase signal to HDMI, if you have interference, blanking, or
36+
# no display
37+
#config_hdmi_boost=4
38+
39+
# uncomment for composite PAL
40+
#sdtv_mode=2
41+
42+
#uncomment to overclock the arm. 700 MHz is the default.
43+
#arm_freq=800
44+
45+
# Uncomment some or all of these to enable the optional hardware interfaces
46+
#dtparam=i2c_arm=on
47+
#dtparam=i2s=on
48+
#dtparam=spi=on
49+
50+
# Uncomment this to enable infrared communication.
51+
#dtoverlay=gpio-ir,gpio_pin=17
52+
#dtoverlay=gpio-ir-tx,gpio_pin=18
53+
54+
# Additional overlays and parameters are documented /boot/overlays/README
55+
56+
# Enable audio (loads snd_bcm2835)
57+
dtparam=audio=on
58+
59+
[pi0]
60+
61+
[pi1]
62+
# GPU Mem
63+
gpu_mem=128
64+
65+
[pi2]
66+
# GPU Mem
67+
gpu_mem=128
68+
69+
[pi3]
70+
# Bluetooth
71+
dtoverlay=pi3-disable-bt
72+
dtoverlay=vc4-fkms-v3d
73+
# GPU Mem
74+
gpu_mem=128
75+
76+
[pi4]
77+
# Enable DRM VC4 V3D driver on top of the dispmanx display stack
78+
dtoverlay=vc4-fkms-v3d
79+
max_framebuffers=2
80+
# GPU Mem
81+
gpu_mem=128
82+
83+
[all]
84+
85+
86+

‎stage3/04-crankshaft-bluetooth/01-run-chroot.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ systemctl enable btdevicedetect
1818
systemctl enable btrestore
1919

2020
# config.txt
21-
echo "" >> /boot/config.txt
22-
echo "# Bluetooth" >> /boot/config.txt
23-
echo "dtoverlay=pi3-disable-bt" >> /boot/config.txt
21+
#echo "" >> /boot/config.txt
22+
#echo "# Bluetooth" >> /boot/config.txt
23+
#echo "dtoverlay=pi3-disable-bt" >> /boot/config.txt
2424

2525
usermod -G bluetooth -a pi
2626
usermod -G bluetooth -a pulse

‎stage3/EXPORT_IMAGE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
IMG_SUFFIX=""
1+
IMG_SUFFIX="-pi2"
22
if [ "${USE_QEMU}" = "1" ]; then
33
export IMG_SUFFIX="${IMG_SUFFIX}-qemu"
44
fi

0 commit comments

Comments
 (0)