Stashed changes
This commit is contained in:
57
makefile
57
makefile
@@ -11,12 +11,24 @@ E2FSPROGS_TAR := $(PACKAGES_DIR)/e2fsprogs-$(E2FSPROGS_VERSION).tar.gz
|
||||
BUSYBOX_TAR := $(PACKAGES_DIR)/busybox-$(BUSYBOX_VERSION).tar.gz
|
||||
ALPINE_TAR := $(PACKAGES_DIR)/alpine-minirootfs-$(ALPINE_VER)-$(ALPINE_ARCH).tar.gz
|
||||
NXP_TAR := $(PACKAGES_DIR)/nxp/kernel/$(NXP_VERSION).tar.gz
|
||||
FMLIB_TAR := $(PACKAGES_DIR)/nxp/fmlib/$(FMLIB_VERSION).tar.gz
|
||||
FMC_TAR := $(PACKAGES_DIR)/nxp/fmc/$(FMC_VERSION).tar.gz
|
||||
VPP_TAR := $(PACKAGES_DIR)/nxp/vpp/$(VPP_VERSION).tar.gz
|
||||
DPDK_TAR := $(PACKAGES_DIR)/nxp/dpdk/$(DPDK_VERSION).tar.gz
|
||||
CRIO_TAR := $(PACKAGES_DIR)/$(CRIO_VERSION).tar.gz
|
||||
|
||||
AARCH64_MUSL_CC_TAR := $(PACKAGES_DIR)/aarch64-linux-musl-cross.tgz
|
||||
|
||||
# ASK-specific
|
||||
MONO_ASK_TAR := $(PACKAGES_DIR)/ask/$(MONO_ASK_VERSION).tar.gz
|
||||
FMLIB_TAR := $(PACKAGES_DIR)/nxp/fmlib/$(FMLIB_VERSION).tar.gz
|
||||
FMC_TAR := $(PACKAGES_DIR)/nxp/fmc/$(FMC_VERSION).tar.gz
|
||||
LIBNFNETLINK_TAR := $(PACKAGES_DIR)/ask/libnfnetlink/$(LIBNFNETLINK_VERSION).tar.bz2
|
||||
LIBNFCT_TAR := $(PACKAGES_DIR)/ask/libnfct/$(LIBNFCT_VERSION).tar.xz
|
||||
LIBMNL_TAR := $(PACKAGES_DIR)/ask/libmnl/$(LIBMNL_VERSION).tar.bz2
|
||||
LIBCLI_TAR := $(PACKAGES_DIR)/ask/libcli/$(LIBCLI_VERSION).tar.gz
|
||||
TCLAP_TAR := $(PACKAGES_DIR)/ask/tclap/$(TCLAP_VERSION).tar.gz
|
||||
LIBXML2_TAR := $(PACKAGES_DIR)/ask/libxml2/$(LIBXML2_VERSION).tar.xz
|
||||
LIBPCAP_TAR := $(PACKAGES_DIR)/ask/libpcap/$(LIBPCAP_VERSION).tar.xz
|
||||
|
||||
# Kubernetes components
|
||||
KUBELET_BIN := $(PACKAGES_DIR)/kubernetes/kubelet-$(KUBE_VERSION)
|
||||
KUBEADM_BIN := $(PACKAGES_DIR)/kubernetes/kubeadm-$(KUBE_VERSION)
|
||||
@@ -118,11 +130,20 @@ $(DOWNLOAD_PACKAGES_STAMP): docker/download-packages.Dockerfile build.env makefi
|
||||
--build-arg KUBE_VERSION=$(KUBE_VERSION) \
|
||||
--build-arg ARCH=$(ARCH) \
|
||||
--build-arg BUSYBOX_VERSION=$(BUSYBOX_VERSION) \
|
||||
--build-arg DEVICE_TREE_TARGET=$(DEVICE_TREE_TARGET) \
|
||||
--build-arg E2FSPROGS_VERSION=$(E2FSPROGS_VERSION) \
|
||||
--build-arg DPDK_VERSION=$(DPDK_VERSION) \
|
||||
--build-arg FMLIB_VERSION=$(FMLIB_VERSION) \
|
||||
--build-arg FMC_VERSION=$(FMC_VERSION) \
|
||||
--build-arg VPP_VERSION=$(VPP_VERSION) \
|
||||
--build-arg MONO_ASK_VERSION=$(MONO_ASK_VERSION) \
|
||||
--build-arg LIBNFNETLINK_VERSION=$(LIBNFNETLINK_VERSION) \
|
||||
--build-arg LIBMNL_VERSION=$(LIBMNL_VERSION) \
|
||||
--build-arg LIBNFCT_VERSION=$(LIBNFCT_VERSION) \
|
||||
--build-arg LIBCLI_VERSION=$(LIBCLI_VERSION) \
|
||||
--build-arg LIBXML2_VERSION=$(LIBXML2_VERSION) \
|
||||
--build-arg LIBPCAP_VERSION=$(LIBPCAP_VERSION) \
|
||||
--build-arg TCLAP_VERSION=$(TCLAP_VERSION) \
|
||||
--build-arg ALPINE_SERIES=$(ALPINE_SERIES) \
|
||||
--build-arg ALPINE_ARCH=$(ALPINE_ARCH) \
|
||||
--build-arg ALPINE_VER=$(ALPINE_VER) \
|
||||
@@ -183,6 +204,36 @@ $(INITRAMFS): $(INITRAMFS_DEPS) $(DOWNLOAD_PACKAGES_STAMP) | $(OUT_DIR)
|
||||
$(CLITOOLS_BIN): $(CLITOOLS_SRCS)
|
||||
$(MAKE) -C clitools build-local VERSION="$(TAG)"
|
||||
|
||||
ASK: $(ASK_TAR) $(LIBNFCT_TAR) $(LIBNFNETLINK_TAR) $(TCLAP_TAR) $(LIBXML2_TAR) | $(OUT_DIR)
|
||||
@echo "Building NXP ASK components and Kernel..."
|
||||
rm -rf "$(OUT_DIR)/ASK"
|
||||
mkdir -p "$(OUT_DIR)/ASK"
|
||||
@build_base_tag=$$(docker image inspect \
|
||||
--format '{{.Id}}' \
|
||||
$(DOCKER_IMAGE_ROOT)/build-base:$(TAG) \
|
||||
| cut -d':' -f2 \
|
||||
| cut -c -8); \
|
||||
docker build \
|
||||
-f docker/ask.Dockerfile \
|
||||
--platform linux/amd64 \
|
||||
--build-arg DOCKER_IMAGE_ROOT=$(DOCKER_IMAGE_ROOT) \
|
||||
--build-arg BUILD_BASE_TAG=$$build_base_tag \
|
||||
--build-arg MONO_ASK_TAR=$(MONO_ASK_TAR) \
|
||||
--build-arg AARCH64_MUSL_CC_TAR=$(AARCH64_MUSL_CC_TAR) \
|
||||
--build-arg NXP_TAR=$(NXP_TAR) \
|
||||
--build-arg FMLIB_TAR=$(FMLIB_TAR) \
|
||||
--build-arg FMC_TAR=$(FMC_TAR) \
|
||||
--build-arg LIBNFNETLINK_TAR=$(LIBNFNETLINK_TAR) \
|
||||
--build-arg LIBMNL_TAR=$(LIBMNL_TAR) \
|
||||
--build-arg LIBNFCT_TAR=$(LIBNFCT_TAR) \
|
||||
--build-arg LIBXML2_TAR=$(LIBXML2_TAR) \
|
||||
--build-arg LIBPCAP_TAR=$(LIBPCAP_TAR) \
|
||||
--build-arg TCLAP_TAR=$(TCLAP_TAR) \
|
||||
--build-arg LIBCLI_TAR=$(LIBCLI_TAR) \
|
||||
--build-arg LIBNFNETLINK_VERSION=$(LIBNFNETLINK_VERSION) \
|
||||
--build-arg LIBNFCT_VERSION=$(LIBNFCT_VERSION) \
|
||||
--output type=local,dest=./$(OUT_DIR)/ASK .
|
||||
|
||||
vpp: $(BUILD_BASE_STAMP) $(VPP_TAR) $(DPDK_TAR) $(FMLIB_TAR) $(FMC_TAR) $(NXP_TAR)
|
||||
@build_base_tag=$$(docker image inspect \
|
||||
--format '{{.Id}}' \
|
||||
@@ -339,5 +390,5 @@ pkgclean:
|
||||
rm -rf $(PACKAGES_DIR)
|
||||
|
||||
.PHONY: release kernel initramfs itb build-base clitools clean distclean pkgclean \
|
||||
vpp \
|
||||
vpp ASK \
|
||||
cluster-config cluster-defconfig cluster-print
|
||||
|
||||
Reference in New Issue
Block a user