build

Signed-off-by: Wesley Gimenes <wehagy@proton.me>
wehagy · Sep 14, 2024 · 6b32817 · 6b32817
1 parent 88a22ad
commit 6b32817
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 72 deletions.
diff --git a/custom-feed/netbird/Makefile.orig b/custom-feed/netbird/Makefile.orig
diff --git a/custom-feed/netbird/patches/010-main_code_fix.patch b/custom-feed/netbird/patches/010-main_code_fix.patch
@@ -0,0 +1,10 @@
+--- a/go.mod
++++ b/go.mod
+@@ -1,6 +1,6 @@
+ module github.com/netbirdio/netbird
+
+-go 1.23.0
++go 1.22.0
+
+ require (
+ 	cunicu.li/go-rosenpass v0.4.0
diff --git a/openwrt-builder.sh b/openwrt-builder.sh
@@ -27,7 +27,6 @@ PACKAGES_IMAGE+=(
     luci
     luci-ssl
     luci-app-attendedsysupgrade
-    luci-app-watchcat
     "${TMP[@]}"
 )
 unset TMP
@@ -45,10 +44,13 @@ build () {
     CONTAINER_IMAGEBUILDER_IMAGE="${CONTAINER_PREFIX}/imagebuilder:${CONTAINER_TAG}"
 
     CONTAINER_COMMON_ARGS=(
+        --transient-store
         run
         --rm
-        --user 0:0
         --pull always
+	--uidmap "${UID}":0:1
+	--gidmap "${UID}":0:1
+        --image-volume tmpfs
         --volume "${PWD}"/bin/:/builder/bin/
         "$([[ -d custom-feed ]] && printf -- '--volume %s/custom-feed/:/builder/custom-feed/:ro' "${PWD}" || true)"
     )
@@ -58,15 +60,24 @@ build () {
         "${CONTAINER_SDK_IMAGE}"
         bash -c "
             # Update feeds and build packages
-            sed --regexp-extended --in-place 's,git\.openwrt\.org\/(openwrt|feed|project),github\.com\/openwrt,' feeds.conf.default
-            sed --in-place '1i src-link custom /builder/custom-feed' feeds.conf.default
+            sed \
+                --in-place \
+                --regexp-extended \
+                    's,git\.openwrt\.org\/(openwrt|feed|project),github\.com\/openwrt,' \
+                    feeds.conf.default
+            sed \
+                --in-place \
+                    '1i src-link custom /builder/custom-feed' \
+                    feeds.conf.default
             ./scripts/feeds update -a
             make defconfig
 
             # Logic to build additional packages
             for PACKAGE in custom-feed/*; do
                 ./scripts/feeds install \"\${PACKAGE##*/}\"
-                make package/\"\${PACKAGE##*/}\"/{clean,compile} -j \"\$( nproc )\"
+                make package/\"\${PACKAGE##*/}\"/{clean,compile} \
+                    V=s \
+                    -j \"\$( nproc )\"
             done
 
             # Clean
@@ -88,7 +99,11 @@ build () {
                 ln -sr \"\${IPK}\" packages/
             done
             shopt -u globstar nullglob
-            make image PROFILE=${PROFILE_IMAGE} PACKAGES=\"${PACKAGES_IMAGE[*]}\"
+
+            make image \
+                V=s \
+                -j \"\$( nproc )\" \
+                PROFILE=${PROFILE_IMAGE} PACKAGES=\"${PACKAGES_IMAGE[*]}\"
         "
     )