Skip to content

[DO NOT MERGE] Update BSP diff for kernel 6.1 and docker #2920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kwang13 wants to merge 2 commits into
base: celadon/t/mr0/master
Choose a base branch
from
Open

[DO NOT MERGE] Update BSP diff for kernel 6.1 and docker #2920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74177dc
[DO NOT MERGE] Remove kernel BSP diff for kernel 6.1
kwang13 Jul 31, 2025
1ce9b9d
[DO NOT MERGE] Enable docker
kwang13 Aug 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
157 changes: 157 additions & 0 deletions bsp_diff/caas/device/intel/mixins/groups/docker/0001-Only-keep-docker-binaries.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
From 67bc476da3c4744fef13fc05609e6236de3b8a89 Mon Sep 17 00:00:00 2001
From: "Wang, Kai Z" <kai.z.wang@intel.com>
Date: Wed, 2 Jul 2025 22:17:03 +0800
Subject: [PATCH] Only keep docker binaries.

Only keep docker binaries.

Signed-off-by: Ziniu Lin <ziniu.lin@intel.com>
Signed-off-by: Deng, Bing <bing.deng@intel.com>
---
true/AndroidBoard.mk | 104 -------------------------------------------
true/product.mk | 17 -------
2 files changed, 121 deletions(-)

diff --git a/true/AndroidBoard.mk b/true/AndroidBoard.mk
index 1a0cdf9..9ac4de5 100644
--- a/true/AndroidBoard.mk
+++ b/true/AndroidBoard.mk
@@ -2,107 +2,3 @@ DOCKERD_ENV_RESOLV_CONF := $(PRODUCT_OUT)/system/etc/resolv.conf
$(DOCKERD_ENV_RESOLV_CONF):
@ln -sf /data/vendor/docker/etc/resolv.conf $(PRODUCT_OUT)/system/etc/resolv.conf
$(PRODUCT_OUT)/system.img: $(DOCKERD_ENV_RESOLV_CONF)
-
-LIC_COMMON_SOURCE := $(PRODUCT_OUT)/vendor/etc/docker/common.tar
-LIC_COMMON_SRC_FILES := $(shell find $(TOP)/vendor/intel/linux-in-container/common/ -type f)
-$(LIC_COMMON_SOURCE): $(LIC_COMMON_SRC_FILES)
- @mkdir -p $(PRODUCT_OUT)/vendor/etc/docker
-ifneq ($(wildcard $(TOP)/vendor/intel/linux-in-container/common),)
- @tar --exclude .git -cf $(PRODUCT_OUT)/vendor/etc/docker/common.tar -C $(TOP)/vendor/intel/linux-in-container/common .
-endif
-
-$(PRODUCT_OUT)/vendor.img: $(LIC_COMMON_SOURCE)
-
-LCS_IMAGE_SOURCE := $(PRODUCT_OUT)/vendor/etc/docker/lcs.tar
-$(LCS_IMAGE_SOURCE):
- @mkdir -p $(PRODUCT_OUT)/vendor/etc/docker
-ifneq ($(wildcard $(TOP)/vendor/intel/linux-in-container/linux-container-screencast),)
- @tar --exclude .git -cf $(PRODUCT_OUT)/vendor/etc/docker/lcs.tar -C $(TOP)/vendor/intel/linux-in-container/linux-container-screencast .
-endif
-
-$(PRODUCT_OUT)/vendor.img: $(LCS_IMAGE_SOURCE)
-
-BUILDIN_DOCKER_IMAGE ?= false
-USE_CUSTOM_SOURCES_LIST ?= false
-USE_CUSTOM_BASE_IMAGE ?= false
-CUSTOM_BASE_IMAGE ?= "cache-registry.caas.intel.com/cache/library/ubuntu:22.04"
-LIC_RESOURCES_FILES := $(shell find $(TOP)/vendor/intel/linux-in-container/gamecore -type f)
-LIC_AICORE_FILES := $(shell find $(TOP)/vendor/intel/linux-in-container/aicore -type f)
-
-.PHONY: lic_resources
-lic_resources: $(LIC_RESOURCES_FILES) $(LIC_AICORE_FILES)
- @mkdir -p $(PRODUCT_OUT)/vendor/etc/docker
-ifneq ($(wildcard $(TOP)/vendor/intel/linux-in-container/gamecore),)
- @tar --exclude .git -cf $(PRODUCT_OUT)/vendor/etc/docker/gamecore.tar -C $(TOP)/vendor/intel/linux-in-container/gamecore .
-endif
-ifneq ($(wildcard $(TOP)/vendor/intel/linux-in-container/aicore),)
- @tar --exclude .git -cf $(PRODUCT_OUT)/vendor/etc/docker/aicore.tar -C $(TOP)/vendor/intel/linux-in-container/aicore .
-endif
-
-define lic_base_build
- @docker rmi -f $(2):$(3) || true
- @DOCKER_BUILDKIT=0 docker build --no-cache --build-arg http_proxy=$(http_proxy) --build-arg https_proxy=$(https_proxy) --build-arg no_proxy=$(no_proxy) --build-arg USE_CUSTOM_SOURCES_LIST=$(USE_CUSTOM_SOURCES_LIST) $(if $(USE_CUSTOM_BASE_IMAGE),--build-arg BASE_IMAGE=$(CUSTOM_BASE_IMAGE)) -f $(1)/Dockerfile.base -t $(2):$(3) $(1)
-endef
-
-define lic_build
- @mkdir -p $(2)
- @cp $(1)/TAG $(2)
- @DOCKER_BUILDKIT=0 docker build --build-arg http_proxy=$(http_proxy) --build-arg https_proxy=$(https_proxy) --build-arg no_proxy=$(no_proxy) -t $(3):$(4) $(1)
- @docker save $(3):$(4) | gzip > $(2)/$(3).tar.gz
- @docker rmi $(3):$(4)
- @docker rmi $(5):$(6)
-endef
-
-GAMECORE_VERSION := $(shell cat $(TOP)/vendor/intel/linux-in-container/gamecore/TAG)
-GAMECORE_BASE_VERSION := $(shell cat $(TOP)/vendor/intel/linux-in-container/gamecore/BASE_TAG)
-AICORE_VERSION := $(shell cat $(TOP)/vendor/intel/linux-in-container/aicore/TAG)
-AICORE_BASE_VERSION := $(shell cat $(TOP)/vendor/intel/linux-in-container/aicore/BASE_TAG)
-
-.PHONY: lic
-lic: .KATI_NINJA_POOL := console
-lic:
- @rm -rf $(PRODUCT_OUT)/docker/lic/gamecore
- @mkdir -p $(PRODUCT_OUT)/docker/lic/gamecore
- @cp -r $(TOP)/vendor/intel/linux-in-container/gamecore/* $(TOP)/vendor/intel/linux-in-container/gamecore/.* $(TOP)/vendor/intel/linux-in-container/common/* $(PRODUCT_OUT)/docker/lic/gamecore
- @rm -rf $(PRODUCT_OUT)/docker/lic/aicore
- @mkdir -p $(PRODUCT_OUT)/docker/lic/aicore
- @cp -r $(TOP)/vendor/intel/linux-in-container/aicore/* $(TOP)/vendor/intel/linux-in-container/common/* $(PRODUCT_OUT)/docker/lic/aicore
- $(call lic_base_build,$(PRODUCT_OUT)/docker/lic/gamecore,gamecore-base,$(GAMECORE_BASE_VERSION))
- $(call lic_build,$(PRODUCT_OUT)/docker/lic/gamecore,$(PRODUCT_OUT)/vendor/etc/docker/image/gamecore,gamecore,$(GAMECORE_VERSION),gamecore-base,$(GAMECORE_BASE_VERSION))
- $(call lic_base_build,$(PRODUCT_OUT)/docker/lic/aicore,aicore-base,$(AICORE_BASE_VERSION))
- $(call lic_build,$(PRODUCT_OUT)/docker/lic/aicore,$(PRODUCT_OUT)/vendor/etc/docker/image/aicore,aicore,$(AICORE_VERSION),aicore-base,$(AICORE_BASE_VERSION))
-
-BUILDIN_DOCKER_LCS_IMAGE ?= false
-
-LCS_VERSION := $(shell cat $(TOP)/vendor/intel/linux-in-container/linux-container-screencast/TAG)
-
-.PHONY: lcs
-lcs: .KATI_NINJA_POOL := console
-lcs:
- @rm -rf $(PRODUCT_OUT)/docker/lic/linux-container-screencast
- @mkdir -p $(PRODUCT_OUT)/docker/lic/linux-container-screencast
- @cp -r $(TOP)/vendor/intel/linux-in-container/linux-container-screencast/* $(TOP)/vendor/intel/linux-in-container/linux-container-screencast/.* $(PRODUCT_OUT)/docker/lic/linux-container-screencast
- @cp -r $(TOP)/vendor/intel/linux-in-container/common/* $(TOP)/vendor/intel/linux-in-container/common/.* $(PRODUCT_OUT)/docker/lic/linux-container-screencast
- $(call lcs_build,$(PRODUCT_OUT)/docker/lic/linux-container-screencast,$(PRODUCT_OUT)/vendor/etc/docker/image/lcs,lcs,$(LCS_VERSION))
-
-define lcs_build
- @mkdir -p $(2)
- @cp $(1)/TAG $(2)
- @DOCKER_BUILDKIT=0 docker build --network=host --build-arg http_proxy=$(http_proxy) --build-arg https_proxy=$(https_proxy) --build-arg no_proxy=$(no_proxy) -t $(3):$(4) $(1)
- @docker save $(3):$(4) | gzip > $(2)/$(3).tar.gz
- @docker rmi $(3):$(4)
-endef
-
-ifeq ($(BUILDIN_DOCKER_IMAGE),true)
-ifeq ($(BUILDIN_DOCKER_LCS_IMAGE),true)
-$(PRODUCT_OUT)/vendor.img: lic lcs lic_resources
-else
-$(PRODUCT_OUT)/vendor.img: lic lic_resources
-endif
-else
-ifeq ($(BUILDIN_DOCKER_LCS_IMAGE),true)
-$(PRODUCT_OUT)/vendor.img: lcs lic_resources
-else
-$(PRODUCT_OUT)/vendor.img: lic_resources
-endif
-endif
diff --git a/true/product.mk b/true/product.mk
index 3dc0107..8856a8d 100644
--- a/true/product.mk
+++ b/true/product.mk
@@ -17,23 +17,6 @@ PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/{{_extra_dir}}/ota.ini:/vendor/etc/docker/config/ota.ini \
$(LOCAL_PATH)/{{_extra_dir}}/ntfs-3g:/vendor/bin/ntfs-3g

-
-PRODUCT_PACKAGES += sumClientInAndroid \
- multiplyServiceInAndroid \
- multiplyClientInAndroid \
- subtractServiceApplicationInAndroid \
- SharedBufferServiceInAndroid \
- SharedBufferClientInAndroid \
- sumRpcClientInAndroid \
- subtractRpcServiceInAndroid \
- LIC \
- liblic \
- libremoteio \
- ContainerManager \
- libstreamingbindersdk \
- libaaudiosdk \
- acrn-virtio-gpu-lcs
-
PRODUCT_PROPERTY_OVERRIDES += \
vendor.nn.hal.grpc_socket_path=/data/vendor/neuralnetworks/ai.socket \
persist.vendor.lic.device=/dev/dri/renderD129 \
--
2.34.1

28 changes: 0 additions & 28 deletions bsp_diff/common/kernel/linux-intel-lts2021/0001-make-vmmouse-report-relative-values.patch
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions bsp_diff/common/kernel/linux-intel-lts2021/0002-greybus-Remove-Android.mk.patch
View file
Open in desktop

This file was deleted.

Loading