diff --git a/.github/actions/build-debian-packages/action.yaml b/.github/actions/build-debian-packages/action.yaml index b90852c545b..2892a9a50e0 100644 --- a/.github/actions/build-debian-packages/action.yaml +++ b/.github/actions/build-debian-packages/action.yaml @@ -32,7 +32,7 @@ runs: sudo docker build --file "tools/buildutils/cw/Containerfile" --tag "android-cuttlefish-build" . sudo docker run -v=$PWD:/mnt/build -w /mnt/build -v=$HOME/bazel-disk-cache:/root/bazel-disk-cache android-cuttlefish-build base -d /root/bazel-disk-cache - sudo docker run ${IMAGE_OPT} -v=$PWD:/mnt/build -w /mnt/build android-cuttlefish-build container + # sudo docker run ${IMAGE_OPT} -v=$PWD:/mnt/build -w /mnt/build android-cuttlefish-build container sudo docker run -v=$PWD:/mnt/build -w /mnt/build android-cuttlefish-build frontend sudo docker run -v=$PWD:/mnt/build -w /mnt/build android-cuttlefish-build cuttlefish-integration-gigabyte-arm64 shell: bash diff --git a/base/cvd/build_external/crosvm/PATCH.minijail_gen_constants.patch b/base/cvd/build_external/crosvm/PATCH.minijail_gen_constants.patch new file mode 100644 index 00000000000..b04d0b5ed5f --- /dev/null +++ b/base/cvd/build_external/crosvm/PATCH.minijail_gen_constants.patch @@ -0,0 +1,17 @@ +diff --git a/third_party/minijail/gen_constants-inl.h b/third_party/minijail/gen_constants-inl.h +--- a/third_party/minijail/gen_constants-inl.h ++++ b/third_party/minijail/gen_constants-inl.h +@@ -74,3 +74,13 @@ struct fscrypt_policy_v1 { + #if !defined(FS_IOC_GET_ENCRYPTION_POLICY_EX) + #define FS_IOC_GET_ENCRYPTION_POLICY_EX _IOWR('f', 22, __u8[9]) + #endif ++ ++#if !defined(PR_GET_AUXV) ++#define PR_GET_AUXV 0x41555856 ++#endif ++#if !defined(PR_SET_MDWE) ++#define PR_SET_MDWE 65 ++#endif ++#if !defined(PR_GET_MDWE) ++#define PR_GET_MDWE 66 ++#endif diff --git a/base/cvd/build_external/crosvm/crosvm.MODULE.bazel b/base/cvd/build_external/crosvm/crosvm.MODULE.bazel index 1ef8127c3a0..bdb98607a32 100644 --- a/base/cvd/build_external/crosvm/crosvm.MODULE.bazel +++ b/base/cvd/build_external/crosvm/crosvm.MODULE.bazel @@ -122,5 +122,8 @@ git_repository( remote = CROSVM_REMOTE, init_submodules = True, patch_strip = 1, - patches = ["@//build_external/crosvm:PATCH.minijail-sys_common_mk.patch"], + patches = [ + "@//build_external/crosvm:PATCH.minijail-sys_common_mk.patch", + "@//build_external/crosvm:PATCH.minijail_gen_constants.patch", + ], ) diff --git a/base/cvd/cuttlefish/package/BUILD.bazel b/base/cvd/cuttlefish/package/BUILD.bazel index 0388482e655..1b29923005c 100644 --- a/base/cvd/cuttlefish/package/BUILD.bazel +++ b/base/cvd/cuttlefish/package/BUILD.bazel @@ -101,8 +101,6 @@ package_files( "bin/modem_simulator": "//cuttlefish/host/commands/modem_simulator", "bin/ms-tpm-20-ref": "@ms-tpm-20-ref//:simulator", "bin/mtools": "@mtools//:mtools", - "bin/netsim": "@android_tools_netsim//:netsim", - "bin/netsimd": "@android_tools_netsim//:netsimd", "bin/openwrt_control_server": "//cuttlefish/host/commands/openwrt_control_server", "bin/operator_proxy": "//cuttlefish/host/frontend/operator_proxy", "bin/pica": "@netsim_crates//:pica__pica", diff --git a/base/debian/changelog b/base/debian/changelog index 8f472b49340..f111da1e216 100644 --- a/base/debian/changelog +++ b/base/debian/changelog @@ -1,3 +1,10 @@ +cuttlefish-common (1.57.3) unstable; urgency=medium + + * Don't ship netsim as part of our debian package for now by @Databean in https://github.com/google/android-cuttlefish/pull/3185 + * Fix CI by @ser-io in https://github.com/google/android-cuttlefish/pull/3184 + + -- Cody Schuffelen Fri, 18 Sep 2026 09:10:58 -0700 + cuttlefish-common (1.57.2) unstable; urgency=medium * Decouple kokoro testing and tools/*/cw/Containerfile by @0405ysj in https://github.com/google/android-cuttlefish/pull/3141 diff --git a/base/debian/control b/base/debian/control index 6a4ff06f087..48fba6c9e02 100644 --- a/base/debian/control +++ b/base/debian/control @@ -90,7 +90,6 @@ Architecture: any Depends: cuttlefish-base, cuttlefish-user, cuttlefish-defaults, - cuttlefish-podcvd, ${misc:Depends} Pre-Depends: ${misc:Pre-Depends} Description: Cuttlefish Android Virtual Device companion package diff --git a/container/debian/changelog b/container/debian/changelog index 7c0ad1e5242..a3ef7718f77 100644 --- a/container/debian/changelog +++ b/container/debian/changelog @@ -1,3 +1,9 @@ +cuttlefish-container (1.57.3) unstable; urgency=medium + + * N/A + + -- Cody Schuffelen Fri, 18 Sep 2026 09:11:25 -0700 + cuttlefish-container (1.57.2) unstable; urgency=medium * Decouple kokoro testing and tools/*/cw/Containerfile by @0405ysj in https://github.com/google/android-cuttlefish/pull/3141 diff --git a/cuttlefish-integration-gigabyte-arm64/debian/changelog b/cuttlefish-integration-gigabyte-arm64/debian/changelog index e4eca65a086..7813e38fb94 100644 --- a/cuttlefish-integration-gigabyte-arm64/debian/changelog +++ b/cuttlefish-integration-gigabyte-arm64/debian/changelog @@ -1,3 +1,9 @@ +cuttlefish-integration-gigabyte-arm64 (1.57.3) unstable; urgency=medium + + * N/A + + -- Cody Schuffelen Fri, 18 Sep 2026 09:10:19 -0700 + cuttlefish-integration-gigabyte-arm64 (1.57.2) unstable; urgency=medium * N/A diff --git a/frontend/debian/changelog b/frontend/debian/changelog index 84e88542d39..420e73ae6bc 100644 --- a/frontend/debian/changelog +++ b/frontend/debian/changelog @@ -1,4 +1,4 @@ -cuttlefish-frontend (1.57.2) UNRELEASED; urgency=medium +cuttlefish-frontend (1.57.2) unstable; urgency=medium * N/A diff --git a/tools/buildutils/build_packages.sh b/tools/buildutils/build_packages.sh index 181a572c71e..4784cca6df1 100755 --- a/tools/buildutils/build_packages.sh +++ b/tools/buildutils/build_packages.sh @@ -19,6 +19,6 @@ BUILD_PACKAGE="$(dirname $0)/build_package.sh" command -v bazel &> /dev/null || sudo "${INSTALL_BAZEL}" install_debuild_dependencies -"${BUILD_PACKAGE}" "${REPO_DIR}/container" $@ +# "${BUILD_PACKAGE}" "${REPO_DIR}/container" $@ "${BUILD_PACKAGE}" "${REPO_DIR}/base" $@ "${BUILD_PACKAGE}" "${REPO_DIR}/frontend" $@ diff --git a/tools/buildutils/cw/Containerfile b/tools/buildutils/cw/Containerfile index 7a75e0f7693..826f8840455 100644 --- a/tools/buildutils/cw/Containerfile +++ b/tools/buildutils/cw/Containerfile @@ -5,11 +5,8 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt update -y && apt upgrade -y RUN apt install -y sudo devscripts -# Download newer version of golang with keep using bookworm for building debian -# packages. -RUN echo "deb http://deb.debian.org/debian bookworm-backports main" > /etc/apt/sources.list.d/backports.list -RUN apt update -RUN apt install -t bookworm-backports -y golang +# DO NOT INSTALL custom packages here! +# Only install packages found in https://github.com/google/android-cuttlefish/blob/main/tools/buildutils/build_packages.sh COPY ./tools/buildutils/installbazel.sh /installbazel.sh RUN /installbazel.sh && rm /installbazel.sh