rpms/selinux-policy
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rename docker-selinux to container-selinux package

Browse Source
This commit is contained in:
Lukas Vrabec 2016-10-10 15:59:49 +02:00
parent 3b618f3b2e
commit ab3db24c9e
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
container-selinux.tgz Normal file
View File

Binary file not shown.

BIN
docker-selinux.tgz
View File

Binary file not shown.

12
make-rhat-patches.sh
View File

@ -12,7 +12,7 @@ POLICYSOURCES=`mktemp -d policysources.XXXXXX`
pushd $POLICYSOURCES > /dev/null pushd $POLICYSOURCES > /dev/null
git clone git@github.com:fedora-selinux/selinux-policy.git -q git clone git@github.com:fedora-selinux/selinux-policy.git -q
git clone git@github.com:fedora-cloud/docker-selinux.git -q git clone git@github.com:projectatomic/container-selinux.git -q
pushd selinux-policy > /dev/null pushd selinux-policy > /dev/null
# prepare policy patches against upstream commits matching the last upstream merge # prepare policy patches against upstream commits matching the last upstream merge
@ -20,18 +20,18 @@ git rev-parse --verify origin/${FEDORA_VERSION}-base; git diff eb4512f6eb13792c7
git rev-parse --verify origin/${FEDORA_VERSION}-contrib; git diff 64302b790bf2b39d93610e1452c8361d56966ae0 origin/${FEDORA_VERSION}-contrib > policy-${FEDORA_VERSION}-contrib.patch git rev-parse --verify origin/${FEDORA_VERSION}-contrib; git diff 64302b790bf2b39d93610e1452c8361d56966ae0 origin/${FEDORA_VERSION}-contrib > policy-${FEDORA_VERSION}-contrib.patch
popd > /dev/null popd > /dev/null
pushd docker-selinux > /dev/null pushd container-selinux > /dev/null
# Actual docker-selinux files are in master branch # Actual container-selinux files are in master branch
#git checkout -b ${DOCKER_FEDORA_VERSION} -t origin/${DOCKER_FEDORA_VERSION} -q #git checkout -b ${DOCKER_FEDORA_VERSION} -t origin/${DOCKER_FEDORA_VERSION} -q
tar -czf docker-selinux.tgz docker.if docker.te docker.fc tar -czf container-selinux.tgz container.if container.te container.fc
popd > /dev/null popd > /dev/null
pushd $DISTGIT_PATH > /dev/null pushd $DISTGIT_PATH > /dev/null
cp $POLICYSOURCES/selinux-policy/policy-${FEDORA_VERSION}-{base,contrib}.patch . cp $POLICYSOURCES/selinux-policy/policy-${FEDORA_VERSION}-{base,contrib}.patch .
cp $POLICYSOURCES/docker-selinux/docker-selinux.tgz . cp $POLICYSOURCES/container-selinux/container-selinux.tgz .
popd > /dev/null popd > /dev/null
popd > /dev/null popd > /dev/null
rm -rf $POLICYSOURCES rm -rf $POLICYSOURCES
echo "policy-rawhide-{contrib,base}.patches and docker.tgz with docker policy files have been created." echo "policy-rawhide-{contrib,base}.patches and container.tgz with container policy files have been created."

8
selinux-policy.spec
View File

@ -55,7 +55,7 @@ Source28: permissivedomains.cil
Source29: serefpolicy-contrib-%{version}.tgz Source29: serefpolicy-contrib-%{version}.tgz
Source30: booleans.subs_dist Source30: booleans.subs_dist
Source35: docker-selinux.tgz Source35: container-selinux.tgz
# Do a factory reset when there's no policy.kern file in a store # Do a factory reset when there's no policy.kern file in a store
# http://bugzilla.redhat.com/1290659 # http://bugzilla.redhat.com/1290659
@ -495,7 +495,7 @@ Obsoletes: mod_fcgid-selinux <= %{version}-%{release}
Obsoletes: cachefilesd-selinux <= 0.10-1 Obsoletes: cachefilesd-selinux <= 0.10-1
Conflicts: seedit Conflicts: seedit
Conflicts: 389-ds-base < 1.2.7, 389-admin < 1.1.12 Conflicts: 389-ds-base < 1.2.7, 389-admin < 1.1.12
Conflicts: docker-selinux < 2:1.12.1-22 Conflicts: container-selinux < 2:1.12.1-22
%description targeted %description targeted
SELinux Reference policy targeted base module. SELinux Reference policy targeted base module.
@ -554,7 +554,7 @@ Requires(pre): coreutils
Requires(pre): selinux-policy = %{version}-%{release} Requires(pre): selinux-policy = %{version}-%{release}
Requires: selinux-policy = %{version}-%{release} Requires: selinux-policy = %{version}-%{release}
Conflicts: seedit Conflicts: seedit
Conflicts: docker-selinux <= 1.9.0-9 Conflicts: container-selinux <= 1.9.0-9
%description minimum %description minimum
SELinux Reference policy minimum base module. SELinux Reference policy minimum base module.
@ -637,7 +637,7 @@ Requires(pre): coreutils
Requires(pre): selinux-policy = %{version}-%{release} Requires(pre): selinux-policy = %{version}-%{release}
Requires: selinux-policy = %{version}-%{release} Requires: selinux-policy = %{version}-%{release}
Conflicts: seedit Conflicts: seedit
Conflicts: docker-selinux <= 1.9.0-9 Conflicts: container-selinux <= 1.9.0-9
%description mls %description mls
SELinux Reference policy mls base module. SELinux Reference policy mls base module.