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

make-rhat-patches.sh - Ignore submodules when generating diff

Browse Source 
Fixes:
File policy/modules/contrib is not a regular file -- refusing to patch
1 out of 1 hunk ignored -- saving rejects to file policy/modules/contrib.rej
This commit is contained in:
Petr Lautrbach 2017-12-06 09:56:06 +01:00
parent 617ff7d328
commit e55ea9eb7a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make-rhat-patches.sh
View File

@ -17,7 +17,7 @@ git clone git@github.com:projectatomic/container-selinux.git -q
pushd selinux-policy > /dev/null
# prepare policy patches against upstream commits matching the last upstream merge
git rev-parse --verify origin/${FEDORA_VERSION}; git diff eb4512f6eb13792c76ff8d3e6f2df3a7155db577 origin/${FEDORA_VERSION} > policy-${FEDORA_VERSION}-base.patch
git rev-parse --verify origin/${FEDORA_VERSION}; git diff --ignore-submodules eb4512f6eb13792c76ff8d3e6f2df3a7155db577 origin/${FEDORA_VERSION} > policy-${FEDORA_VERSION}-base.patch
popd > /dev/null
pushd selinux-policy-contrib > /dev/null