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

Cleanup in Dockerfile and build script #39

Merged
PeterSurda merged 4 commits from lee.miller/openwrt:cleanup into main 2023-05-30 07:30:36 +00:00
Conversation 2 Commits 4 Files Changed 3 +7 -10
lee.miller commented 2023-05-25 21:41:37 +00:00
Collaborator
Copy Link

Hello!

There are minor corrections in the buildbot multibuild dir that aim to remove redundant commands and make the build process clearer.

My debug patch, I use to build locally, also contains this:

diff --git a/.buildbot/openwrt/Dockerfile b/.buildbot/openwrt/Dockerfile
index 5b374be..d0fc6c1 100644
--- a/.buildbot/openwrt/Dockerfile
+++ b/.buildbot/openwrt/Dockerfile
@@ -21,7 +21,9 @@ RUN wget -qP /Downloads \
 RUN wget -qP /Downloads \
      "https://downloads.openwrt.org/releases/${OPENWRT_VERSION}/targets/bcm27xx/bcm2711/openwrt-sdk-${OPENWRT_VERSION}-${OPENWRT_TARGET}-${OPENWRT_DEVICE}_${OPENWRT_CC}.Linux-x86_64.tar.xz"
 
-RUN wget -qP /Downloads \
-     "https://downloads.openwrt.org/releases/${OPENWRT_VERSION}/targets/bcm27xx/bcm2711/openwrt-toolchain-${OPENWRT_VERSION}-${OPENWRT_TARGET}-${OPENWRT_DEVICE}_${OPENWRT_CC}.Linux-x86_64.tar.xz"
+# RUN wget -qP /Downloads \
+#      "https://downloads.openwrt.org/releases/${OPENWRT_VERSION}/targets/bcm27xx/bcm2711/openwrt-toolchain-${OPENWRT_VERSION}-${OPENWRT_TARGET}-${OPENWRT_DEVICE}_${OPENWRT_CC}.Linux-x86_64.tar.xz"
+
+RUN apt -yq install python3-distutils
 
 ADD . .

I guess python3-distutils is preinstalled for buildbot in your images.

Also I'm thinking of adding || exit 1 to detect broken builds better.

Hello! There are minor corrections in the buildbot multibuild dir that aim to remove redundant commands and make the build process clearer. My debug patch, I use to build locally, also contains this: ```diff diff --git a/.buildbot/openwrt/Dockerfile b/.buildbot/openwrt/Dockerfile index 5b374be..d0fc6c1 100644 --- a/.buildbot/openwrt/Dockerfile +++ b/.buildbot/openwrt/Dockerfile @@ -21,7 +21,9 @@ RUN wget -qP /Downloads \ RUN wget -qP /Downloads \ "https://downloads.openwrt.org/releases/${OPENWRT_VERSION}/targets/bcm27xx/bcm2711/openwrt-sdk-${OPENWRT_VERSION}-${OPENWRT_TARGET}-${OPENWRT_DEVICE}_${OPENWRT_CC}.Linux-x86_64.tar.xz" -RUN wget -qP /Downloads \ - "https://downloads.openwrt.org/releases/${OPENWRT_VERSION}/targets/bcm27xx/bcm2711/openwrt-toolchain-${OPENWRT_VERSION}-${OPENWRT_TARGET}-${OPENWRT_DEVICE}_${OPENWRT_CC}.Linux-x86_64.tar.xz" +# RUN wget -qP /Downloads \ +# "https://downloads.openwrt.org/releases/${OPENWRT_VERSION}/targets/bcm27xx/bcm2711/openwrt-toolchain-${OPENWRT_VERSION}-${OPENWRT_TARGET}-${OPENWRT_DEVICE}_${OPENWRT_CC}.Linux-x86_64.tar.xz" + +RUN apt -yq install python3-distutils ADD . . ``` I guess `python3-distutils` is preinstalled for buildbot in your images. Also I'm thinking of adding `|| exit 1` to detect broken builds better.
lee.miller added 2 commits 2023-05-25 21:41:38 +00:00
78bcedaf60
Cleanup build.sh: 
- show the manifest existing after make image instead of making a new one;
  - don't move packages to out - the directory is ignored by multibuild;
  - don't make package index, because imagebuilder builds it's own.
lee.miller added 2 commits 2023-05-25 22:52:27 +00:00
buildbot/travis_bionic Build done. Details
buildbot/multibuild_parent Build done. Details
buildbot/job/openwrt Build done. Details
a3ddbfac67
Exit early if imagebuilder fails
PeterSurda approved these changes 2023-05-28 06:43:49 +00:00
PeterSurda left a comment
Owner
Copy Link

It looks ok but I'll test it first. We don't need make manifest anymore?

It looks ok but I'll test it first. We don't need `make manifest` anymore?
lee.miller commented 2023-05-28 21:31:49 +00:00
Author
Collaborator
Copy Link

It looks ok but I'll test it first. We don't need make manifest anymore?

Yes, it's a part of make image.

> It looks ok but I'll test it first. We don't need `make manifest` anymore? Yes, it's a part of `make image`.
PeterSurda commented 2023-05-30 07:30:05 +00:00
Owner
Copy Link

seems to work ok

seems to work ok
PeterSurda merged commit a3ddbfac67 into main 2023-05-30 07:30:36 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
PeterSurda
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Sysdeploy/openwrt#39
No description provided.
Delete Branch "lee.miller/openwrt:cleanup"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?