Skip to content
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.

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

update to SDK v0.11.0 #926

Merged
merged 5 commits into from
May 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Makefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ DOCKER_BUILDKIT = "1"

[env.development]
# Defined here to allow us to override ${BUILDSYS_ARCH} on the command line.
BUILDSYS_SDK_IMAGE = "bottlerocket/sdk-${BUILDSYS_ARCH}:v0.10.1"
BUILDSYS_SDK_IMAGE = "bottlerocket/sdk-${BUILDSYS_ARCH}:v0.11.0"
# Extra flags used when spawning containers.
#
# ex: BUILDSYS_DOCKER_RUN_ARGS="--network=host --dns=127.0.0.53"
Expand Down
1 change: 1 addition & 0 deletions macros/shared
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ pkgconfig = '/usr/bin/pkg-config'\
[properties]\
c_args = [%{_cross_c_args}]\
c_link_args = [%{_cross_c_link_args}]\
pkg_config_libdir = '%{_cross_pkgconfigdir}'\
[host_machine]\
system = 'linux'\
cpu_family ='%{_cross_cpu_family}'\
Expand Down
2 changes: 1 addition & 1 deletion packages/glibc/glibc.spec
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ CFLAGS="${BUILDFLAGS}" CPPFLAGS="" CXXFLAGS="${BUILDFLAGS}" \
--build="%{_build}" \
--with-headers="%{_cross_includedir}" \
--enable-bind-now \
--enable-kernel="4.19" \
--enable-kernel="5.4.0" \
--enable-shared \
--enable-stack-protector=strong \
--enable-static-pie \
Expand Down
30 changes: 15 additions & 15 deletions packages/selinux-policy/files.cil
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
(classpermissionset relabel_fifo_file (
fifo_file (relabelfrom relabelto)))
(classpermissionset relabel_filesystem (
filesystem (associate relabelfrom relabelto transition)))
filesystem (associate relabelfrom relabelto)))
(classpermissionset relabel_kernel_service (
kernel_service (create_files_as)))

Expand All @@ -103,19 +103,19 @@
(classpermission mount_fifo_file)
(classpermission mount_filesystem)
(classpermissionset mount_file (
file (mounton quotaon swapon)))
file (mounton quotaon)))
(classpermissionset mount_dir (
dir (mounton quotaon swapon)))
dir (mounton quotaon)))
(classpermissionset mount_lnk_file (
lnk_file (mounton quotaon swapon)))
lnk_file (mounton quotaon)))
(classpermissionset mount_chr_file (
chr_file (mounton quotaon swapon)))
chr_file (mounton quotaon)))
(classpermissionset mount_blk_file (
blk_file (mounton quotaon swapon)))
blk_file (mounton quotaon)))
(classpermissionset mount_sock_file (
sock_file (mounton quotaon swapon)))
sock_file (mounton quotaon)))
(classpermissionset mount_fifo_file (
fifo_file (mounton quotaon swapon)))
fifo_file (mounton quotaon)))
(classpermissionset mount_filesystem (
filesystem (mount quotamod remount unmount)))

Expand Down Expand Up @@ -216,36 +216,36 @@
file (not (
entrypoint execute_no_trans
execute ioctl getattr map open read execmod
relabelfrom relabelto mounton quotaon swapon
relabelfrom relabelto mounton quotaon
watch watch_mount watch_reads watch_sb watch_with_perm))))
(classpermissionset mutate_dir (
dir (not (
search
execute ioctl getattr map open read execmod
relabelfrom relabelto mounton quotaon swapon
relabelfrom relabelto mounton quotaon
watch watch_mount watch_reads watch_sb watch_with_perm))))
(classpermissionset mutate_lnk_file (
lnk_file (not (
execute ioctl getattr map open read execmod
relabelfrom relabelto mounton quotaon swapon
relabelfrom relabelto mounton quotaon
watch watch_mount watch_reads watch_sb watch_with_perm))))
(classpermissionset mutate_chr_file (
chr_file (not (
execute ioctl getattr map open read execmod
relabelfrom relabelto mounton quotaon swapon
relabelfrom relabelto mounton quotaon
watch watch_mount watch_reads watch_sb watch_with_perm))))
(classpermissionset mutate_blk_file (
blk_file (not (
execute ioctl getattr map open read execmod
relabelfrom relabelto mounton quotaon swapon
relabelfrom relabelto mounton quotaon
watch watch_mount watch_reads watch_sb watch_with_perm))))
(classpermissionset mutate_sock_file (
sock_file (not (
execute ioctl getattr map open read execmod
relabelfrom relabelto mounton quotaon swapon
relabelfrom relabelto mounton quotaon
watch watch_mount watch_reads watch_sb watch_with_perm))))
(classpermissionset mutate_fifo_file (
fifo_file (not (
execute ioctl getattr map open read execmod
relabelfrom relabelto mounton quotaon swapon
relabelfrom relabelto mounton quotaon
watch watch_mount watch_reads watch_sb watch_with_perm))))
1 change: 1 addition & 0 deletions tools/docker-go
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ docker run --rm \
-e GOPATH='/tmp/go' \
"${proxy_env[@]}" \
--user "$(id -u):$(id -g)" \
--security-opt label:disable \
${DOCKER_RUN_ARGS} \
-v "${GO_MOD_CACHE}":/tmp/go/pkg/mod \
-v "${GO_MODULE_PATH}":/usr/src/host-ctr \
Expand Down