Sysdeploy/openwrt
2
0
Fork 2
Code Issues 5 Pull Requests 2 Packages Projects 1 Releases Wiki Activity

Adding files #3

Merged
PeterSurda merged 7 commits from lee.miller/openwrt:quectel into main 2023-05-23 06:45:04 +02:00
Conversation 41 Commits 7 Files Changed 14 +18 -4
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 644618d9c4 - Show all commits

12
.buildbot/openwrt/build.sh
View File

@ -110,7 +110,7 @@ chmod 0400 files/etc/dropbear/authorized_keys
mkdir -p files/etc/uci-defaults mkdir -p files/etc/uci-defaults
cp ${pwd}/defaults/* files/etc/uci-defaults cp ${pwd}/defaults/* files/etc/uci-defaults
cp ${pwd}/overlays/dualeth.txt ${BOOTSOURCE} cp ${pwd}/overlays/dualeth.txt ${BOOTSOURCE}/current.txt
cp ${BOOTCONFIG} . cp ${BOOTCONFIG} .
@ -120,19 +120,23 @@ dtparam=spi=on
dtparam=i2s=on dtparam=i2s=on
dtoverlay=i2c-rtc,ds1307 dtoverlay=i2c-rtc,ds1307
include dualeth.txt include current.txt
EOF EOF
pushd ${BOOTSOURCE}
PeterSurda commented 2023-02-21 05:52:38 +01:00
Outdated
Review
Copy Link

this also seems to work ok

this also seems to work ok
lee.miller commented 2023-02-22 03:21:11 +01:00
Outdated
Review
Copy Link

The cause seems to be in the line 124. There should be ${pwd}/overlays/sensing.txt.

The cause seems to be in the line 124. There should be `${pwd}/overlays/sensing.txt`.
git apply ${pwd}/patches/bootconfig-add.patch
popd
make image PROFILE=${PROFILE} \ make image PROFILE=${PROFILE} \
PACKAGES="${PACKAGES}" DISABLED_SERVICES="dropbear" FILES="files" PACKAGES="${PACKAGES}" DISABLED_SERVICES="dropbear" FILES="files"
mv ${IMAGE_PATH}-squashfs-factory.img.gz ${IMAGE_PATH}-squashfs-factory-dualeth.img.gz mv ${IMAGE_PATH}-squashfs-factory.img.gz ${IMAGE_PATH}-squashfs-factory-dualeth.img.gz
mv ${IMAGE_PATH}-squashfs-sysupgrade.img.gz ${IMAGE_PATH}-squashfs-sysupgrade-dualeth.img.gz mv ${IMAGE_PATH}-squashfs-sysupgrade.img.gz ${IMAGE_PATH}-squashfs-sysupgrade-dualeth.img.gz
cp ${pwd}/overlays/sensing.txt ${BOOTSOURCE} cp ${pwd}/overlays/sensing.txt ${BOOTSOURCE}/current.txt
cp ${pwd}/overlays/*.dtbo ${OVERLAYSOURCE} cp ${pwd}/overlays/*.dtbo ${OVERLAYSOURCE}
cp config.txt ${BOOTCONFIG} cp config.txt ${BOOTCONFIG}
echo "include sensing.txt" >> ${BOOTCONFIG} echo "include current.txt" >> ${BOOTCONFIG}
pushd ${KERNELSOURCE} pushd ${KERNELSOURCE}
git apply ${pwd}/patches/overlay-add.patch git apply ${pwd}/patches/overlay-add.patch
popd popd

10
patches/bootconfig-add.patch Normal file
View File

@ -0,0 +1,10 @@
--- a/Makefile 2023-05-17 03:13:19.345089802 +0300
+++ b/Makefile 2023-05-17 03:15:55.564872084 +0300
@@ -22,6 +22,7 @@
mcopy -i $@.boot cmdline.txt ::
mcopy -i $@.boot config.txt ::
mcopy -i $@.boot distroconfig.txt ::
+ mcopy -i $@.boot current.txt ::
mcopy -i $@.boot $(IMAGE_KERNEL) ::$(KERNEL_IMG)
$(foreach dts,$(shell echo $(DEVICE_DTS)),mcopy -i $@.boot $(DTS_DIR)/$(dts).dtb ::;)
mmd -i $@.boot ::/overlays