mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-16 16:02:33 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'libtool-from-testing' into 'master'

Browse source 
buildserver: support installing packages from Debian/testing

Closes #224

See merge request !200
This commit is contained in:
Hans-Christoph Steiner 2017-01-12 12:59:57 +00:00
commit 7a1b99f11a
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
buildserver/provision-apt-get-install
View file

@ -16,6 +16,8 @@ printf 'APT::Acquire::Retries "20";\n' \
if grep --quiet jessie /etc/apt/sources.list; then if grep --quiet jessie /etc/apt/sources.list; then
echo "deb $debian_mirror jessie-backports main" > /etc/apt/sources.list.d/backports.list echo "deb $debian_mirror jessie-backports main" > /etc/apt/sources.list.d/backports.list
echo "deb $debian_mirror testing main" > /etc/apt/sources.list.d/testing.list
printf "Package: *\nPin: release o=Debian,a=testing\nPin-Priority: -300\n" > /etc/apt/preferences.d/debian-testing
fi fi
dpkg --add-architecture i386 dpkg --add-architecture i386
@ -59,8 +61,8 @@ packages="
libsaxonb-java libsaxonb-java
libssl-dev libssl-dev
libstdc++6:i386 libstdc++6:i386
libtool libtool/testing
libtool-bin libtool-bin/testing
make make
maven maven
mercurial mercurial

6
fdroidserver/metadata.py
View file

@ -996,7 +996,11 @@ def parse_metadata(metadatapath, check_vcs=False):
vcs.gotorevision('HEAD') # HEAD since we can't know where else to go vcs.gotorevision('HEAD') # HEAD since we can't know where else to go
if os.path.isfile(metadata_in_repo): if os.path.isfile(metadata_in_repo):
logging.debug('Including metadata from ' + metadata_in_repo) logging.debug('Including metadata from ' + metadata_in_repo)
app.update(parse_metadata(metadata_in_repo)) # do not include fields already provided by main metadata file
app_in_repo = parse_metadata(metadata_in_repo).field_dict()
for k, v in app_in_repo.items():
if k not in app.field_dict():
app.set_field(k, v)
post_metadata_parse(app) post_metadata_parse(app)

4
makebuildserver
View file

@ -123,8 +123,8 @@ if config['apt_package_cache']:
cachefiles = [ cachefiles = [
('https://dl.google.com/android/repository/tools_r25.2.2-linux.zip', ('https://dl.google.com/android/repository/tools_r25.2.2-linux.zip',
'10d5185af8fee80a7ee093585bf84962d0a877b92a8fef489e2030e910f6a360'), '10d5185af8fee80a7ee093585bf84962d0a877b92a8fef489e2030e910f6a360'),
('https://dl.google.com/android/repository/android_m2repository_r40.zip', ('https://dl.google.com/android/repository/android_m2repository_r41.zip',
'be4c20cdecba6186d046b4a499895a9a8be1955427dc3f3e7495fa9dcc392d29'), 'db680c430fb0b851a2c66bf0bbf07b86dcbd60b48abc14859a054d347fe8f2a2'),
('https://dl.google.com/android/repository/android-1.5_r04-linux.zip', ('https://dl.google.com/android/repository/android-1.5_r04-linux.zip',
'85b6c8f9797e56aa415d3a282428bb640c96b0acb17c11d41621bb2a5302fe64'), '85b6c8f9797e56aa415d3a282428bb640c96b0acb17c11d41621bb2a5302fe64'),
('https://dl.google.com/android/repository/android-1.6_r03-linux.zip', ('https://dl.google.com/android/repository/android-1.6_r03-linux.zip',