penguin/monok8s
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed build dependency on jq

Browse Source
This commit is contained in:
斟酌 鵬兄
2026-04-28 00:57:23 +08:00
parent 84d2c7c8e8
commit 7b31a1dec3
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
alpine/build-rootfs.sh
View File

@@ -119,6 +119,8 @@ mkdir -p "$FAKE_DEV" "$MNT_ROOTFS_IMG" "$MNT_DATA"
echo "##################################################### Packaging RootFS $(du -sh "$ROOTFS" | awk '{print $1}')" echo "##################################################### Packaging RootFS $(du -sh "$ROOTFS" | awk '{print $1}')"
ensure_loop_ready
############################################################################### ###############################################################################
# 1. Build reusable rootfs ext4 image once # 1. Build reusable rootfs ext4 image once
############################################################################### ###############################################################################
@@ -199,8 +201,6 @@ sgdisk -o "$IMG" \
-n 3:0:+2560M -t 3:8300 -c 3:rootfsB \ -n 3:0:+2560M -t 3:8300 -c 3:rootfsB \
-n 4:0:0 -t 4:8300 -c 4:data -n 4:0:0 -t 4:8300 -c 4:data
ensure_loop_ready
losetup -D losetup -D
LOOP=$(losetup --find --show -P "$IMG") LOOP=$(losetup --find --show -P "$IMG")
/sync-loop.sh "$LOOP" /sync-loop.sh "$LOOP"

18
makefile
View File

@@ -148,7 +148,11 @@ $(BUILD_BASE_STAMP): $(BUILD_BASE_DEPS) | $(OUT_DIR)
--build-arg APT_PROXY=$(APT_PROXY) \ --build-arg APT_PROXY=$(APT_PROXY) \
--build-arg TAG=$(TAG) \ --build-arg TAG=$(TAG) \
-t $(DOCKER_IMAGE_ROOT)/build-base:$(TAG) . -t $(DOCKER_IMAGE_ROOT)/build-base:$(TAG) .
@iid=$$(docker image inspect monok8s/build-base:$(TAG) | jq -r '.[].Id' | cut -d':' -f2 | cut -c -8); \ @iid=$$(docker image inspect \
--format '{{.Id}}' \
$(DOCKER_IMAGE_ROOT)/build-base:$(TAG) \
| cut -d':' -f2 \
| cut -c -8); \
docker tag monok8s/build-base:$(TAG) monok8s/build-base:$$iid; \ docker tag monok8s/build-base:$(TAG) monok8s/build-base:$$iid; \
touch $@ touch $@
@@ -181,7 +185,11 @@ $(CLITOOLS_BIN): $(CLITOOLS_SRCS)
$(MAKE) -C clitools build-agent $(MAKE) -C clitools build-agent
vpp: $(BUILD_BASE_STAMP) $(VPP_TAR) $(DPDK_TAR) $(FMLIB_TAR) $(FMC_TAR) $(NXP_TAR) vpp: $(BUILD_BASE_STAMP) $(VPP_TAR) $(DPDK_TAR) $(FMLIB_TAR) $(FMC_TAR) $(NXP_TAR)
@build_base_tag=$$(docker image inspect $(DOCKER_IMAGE_ROOT)/build-base:$(TAG) | jq -r '.[0].Id' | cut -d':' -f2 | cut -c -8); \ @build_base_tag=$$(docker image inspect \
--format '{{.Id}}' \
$(DOCKER_IMAGE_ROOT)/build-base:$(TAG) \
| cut -d':' -f2 \
| cut -c -8); \
@mkdir -p $(OUT_DIR)/vpp @mkdir -p $(OUT_DIR)/vpp
docker build \ docker build \
-f docker/vpp.Dockerfile \ -f docker/vpp.Dockerfile \
@@ -220,7 +228,11 @@ $(BOARD_ITB): $(ITB_DEPS) | $(OUT_DIR)
test -f $@ test -f $@
$(RELEASE_IMAGE): $(RELEASE_DEPS) $(DOWNLOAD_PACKAGES_STAMP) | $(OUT_DIR) $(RELEASE_IMAGE): $(RELEASE_DEPS) $(DOWNLOAD_PACKAGES_STAMP) | $(OUT_DIR)
@build_base_tag=$$(docker image inspect $(DOCKER_IMAGE_ROOT)/build-base:$(TAG) | jq -r '.[0].Id' | cut -d':' -f2 | cut -c -8); \ @build_base_tag=$$(docker image inspect \
--format '{{.Id}}' \
$(DOCKER_IMAGE_ROOT)/build-base:$(TAG) \
| cut -d':' -f2 \
| cut -c -8); \
docker build \ docker build \
-f docker/alpine.Dockerfile \ -f docker/alpine.Dockerfile \
--no-cache \ --no-cache \