metalefty/glibc
1
0
Fork 0
forked from rpms/glibc
Code Pull Requests Activity

Auto-sync with upstream master.

Browse Source
This commit is contained in:
Carlos O'Donell 2016-03-07 11:47:23 -05:00
parent 9fce0748c4
commit 99a6d4df1b
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/glibc-2.23-69-gf5e753c8.tar.gz

7
glibc.spec
View File

@ -1,6 +1,6 @@
%define glibcsrcdir glibc-2.23-40-gde51ff8 %define glibcsrcdir glibc-2.23-69-gf5e753c8
%define glibcversion 2.23.90 %define glibcversion 2.23.90
%define glibcrelease 4%{?dist} %define glibcrelease 5%{?dist}
# Pre-release tarballs are pulled in from git using a command that is # Pre-release tarballs are pulled in from git using a command that is
# effectively: # effectively:
# #
@ -2092,6 +2092,9 @@ rm -f *.filelist*
%endif %endif
%changelog %changelog
* Mon Mar 07 2016 Carlos O'Donell <carlos@systemhalted.org> - 2.23.90-5
- Auto-sync with upstream master.
* Sun Mar 6 2016 Florian Weimer <fweimer@redhat.com> - 2.23.90-4 * Sun Mar 6 2016 Florian Weimer <fweimer@redhat.com> - 2.23.90-4
- Remove extend_alloca (#1315108) - Remove extend_alloca (#1315108)

2
sources
View File

@ -1 +1 @@
d1dab355e80e61297ed07d6b402cbbe1 glibc-2.23-40-gde51ff8.tar.gz b01f358459ba0816cfa7adb2a3ae2426 glibc-2.23-69-gf5e753c8.tar.gz

17
sync-upstream.sh
View File

@ -23,6 +23,8 @@ set -e
# We want to sync from master by default. Change this if you want to sync from # We want to sync from master by default. Change this if you want to sync from
# another branch. # another branch.
branch=master branch=master
# Avoid slashes in branch name.
branch_name=master
# We can't do anything without an upstream repo # We can't do anything without an upstream repo
if [ $# -ne 1 ]; then if [ $# -ne 1 ]; then
@ -91,8 +93,13 @@ rm -f "$tmpfile"
rm -rf "$srcdir" rm -rf "$srcdir"
echo "+ Source prep is clean, so we're good to go." echo "+ Source prep is clean, so we're good to go."
fedpkg new-sources "$srcdir.tar.gz" fedpkg new-sources "$srcdir.tar.gz"
git commit -a -m "Auto-sync with upstream $branch." if [ $branch == "master" ]; then
exit 0 git commit -a -m "Auto-sync with upstream $branch."
fedpkg push fedpkg push
fedpkg build fedpkg build
echo "+ Done!" echo "+ Done!"
else
echo "+ This is a non-development branch."
echo "+ Please review the results of the sync."
echo "+ Once reviewed you need to commit, push, and build."
fi