Compare commits

...

2 Commits

Author SHA1 Message Date
George Joseph
7257029c2d build: Add "basebranch" to .gitreview
If you have a development branch for a major project that
will receive gerrit reviews it'll probably be named something
like "development/16/newproject".  That will necessitate setting
"defaultbranch=development/16/newproject" in .gitreview.  The
make_version script uses that variable to construct the asterisk
version however, which results in versions like
"GIT-development/16/newproject-ee582a8c7b" which is probably not
what you want.  Worse, since the download_externals script uses
make_version to construct the URL to download the binary codecs
or DPMA.  Since it's expecting a simple numeric version, the
downloads will fail.

To get this to work, a new variable "basebranch" has been added
to .gitreview and make_version has been updated to use that instead
of defaultversion:

.gitreview:
defaultbranch=development/16/myproject
basebranch=16

Now git-review will send the reviews to the proper branch
(development/16/myproject) but the version will still be
constructed using the simple branch number (16).

If "basebranch" is missing from .gitreview, make_version will
fall back to using "defaultbranch".

Change-Id: I2941a3b21e668febeb6cfbc1a7bb51a67726fcc4
2022-06-28 08:52:38 -06:00
Stanislav Abramenkov
cd85f4a2a7 pjsip: Upgrade bundled version to pjproject 2.12.1
More information:
https://github.com/pjsip/pjproject/releases/tag/2.12.1

Pull request to third-party
https://github.com/asterisk/third-party/pull/11

ASTERISK-30050

Change-Id: Icb4e86d4b85ef9b975355c91f3ed56a50b51c6bd
2022-06-17 12:41:54 -05:00
4 changed files with 3 additions and 3 deletions

View File

@@ -1,5 +1,5 @@
[gerrit]
defaultbranch=16
defaultbranch=development/16/geolocation
basebranch=16
#
# Intentional padding to ensure it is possible to point a commit

View File

@@ -0,0 +1 @@
7f80ba8e1540853f959be6be7912a150 pjproject-2.12.1.tar.bz2

View File

@@ -1 +0,0 @@
ad796d38f5f0357cb5b2fe1b4460b581 pjproject-2.12.tar.bz2

View File

@@ -1,2 +1,2 @@
JANSSON_VERSION = 2.14
PJPROJECT_VERSION = 2.12
PJPROJECT_VERSION = 2.12.1