Commit Graph

1498 Commits

Author SHA1 Message Date
Simon McVittie
3fc47aa0d3 Link libselinux into bwrap (if enabled) with LDADD, not LDFLAGS
As explained in bubblewrap commit f6ca3690, libraries should
always go in LDADD and not LDFLAGS, because the order of arguments
to the linker matters. Many distributions' linkers are tolerant
enough that it doesn't matter in practice, but it matters for
static linking, and it might also matter on Ubuntu.

Signed-off-by: Simon McVittie <smcv@debian.org>
2016-06-12 17:08:47 -04:00
Simon McVittie
ccaa7428ae autogen.sh: rely on VPATH when generating Makefile-*.am.inc
This avoids hard-coding the (potentially absolute) srcdir used at
autogen time into the build system. It's fine for an Automake build
system to use relative paths in dependencies and rely on them being
interpreted as relative to ${srcdir} even though the current working
directory is ${buildddir}, because of make's "VPATH" feature, and we
do it all the time in the handwritten parts of the build system.

In particular, this (finally) makes distcheck work.

Signed-off-by: Simon McVittie <smcv@debian.org>
2016-06-12 10:35:33 +01:00
Simon McVittie
ee77be10b5 tests: clean up what is distributed
Listing variables whose values are conditional in EXTRA_DIST is
problematic: if Flatpak was configured without installed-tests,
we would not distribute those files. This is a problem during
distcheck, where installed-tests are disabled.

For files not placed in a special subdirectory, glib-tap.mk handles
this for us. For the keyring and the databases, we have to do it
ourselves, by arranging for them to be in a dist_ variable that is
special to Automake - when determining what to distribute, Automake
includes anything that is selected for distribution under any
combination of conditionals.

While I'm here, include test keyring's README in tarballs: its advice
is equally applicable in a tarball release.

Signed-off-by: Simon McVittie <smcv@debian.org>
2016-06-12 10:35:13 +01:00
Simon McVittie
f8f4f530ab Permission store, document portal: do not distribute generated files
Signed-off-by: Simon McVittie <smcv@debian.org>
2016-06-12 10:35:13 +01:00
Simon McVittie
2e729aacab lib: do not distribute generated files in tarball
Signed-off-by: Simon McVittie <smcv@debian.org>
2016-06-12 10:35:13 +01:00
Simon McVittie
c18626f11c common: don't distribute generated GDBus files in tarballs
Signed-off-by: Simon McVittie <smcv@debian.org>
2016-06-12 10:35:13 +01:00
Alexander Larsson
c741200fa5 NEWS: Update for release 0.6.5 2016-06-10 13:44:52 +02:00
Alexander Larsson
10c6e15506 Merge pull request #32 from matthiasclasen/completion
Handle bash completion in C
2016-06-10 13:00:43 +02:00
Alexander Larsson
874fbbff34 Fix various leaks 2016-06-10 12:59:30 +02:00
Alexander Larsson
528b150162 Update valgrind test support 2016-06-10 12:59:11 +02:00
Alexander Larsson
2e7d89a9c2 Update to latest bubblewrap 2016-06-10 10:09:02 +02:00
Alexander Larsson
b84d3641f6 Merge pull request #105 from matthiasclasen/doc-cleanups
Misc man page cleanups
2016-06-10 09:14:37 +02:00
Alexander Larsson
4468ba522b Merge pull request #106 from matthiasclasen/document-portal-fixes
Some document portal cleanups
2016-06-10 09:13:37 +02:00
Matthias Clasen
0d2b3ec5d0 flatpak enter: Add completion
This was the last command without completion, so we're complete!
2016-06-10 01:09:51 -04:00
Matthias Clasen
de967dfb5b flatpak enter: Stop parsing context options
We don't make any use of these options, and the documentation
does not mention them either, so stop accepting them.
2016-06-10 01:07:07 -04:00
Matthias Clasen
302dbd2910 Trivial whitespace fix 2016-06-10 00:54:04 -04:00
Matthias Clasen
7cdb8c386c completion: Ensure --help options show up
Help was not showing up in completions, which is unfortunate.
2016-06-10 00:47:20 -04:00
Matthias Clasen
f53533ff48 Fix compiler warnings
There are a number of -Wshadow warnings in document-portal/.
Fix them.
2016-06-09 23:47:41 -04:00
Matthias Clasen
fbefba695c document portal: Improve logging
Make the error printing more pretty.
2016-06-09 23:30:12 -04:00
Matthias Clasen
c5155402b2 document portal: Make -v work
We need to set the log handler for our docmain, not the NULL domain.
2016-06-09 23:19:18 -04:00
Matthias Clasen
f1350f7853 flatpak-override docs: Add missing options
The --system-own-name and --system-talk-name options were missing
here.
2016-06-09 22:57:46 -04:00
Matthias Clasen
6ffb5cf21b flatpak-override docs: Fix spelling
We use well-known, following the D-Bus specification.
2016-06-09 22:54:09 -04:00
Matthias Clasen
e7fe604ae5 flatpak-remote-modify docs: Fix broken references
The commands were rotated: it is remote-add, not add-remote.
2016-06-09 22:52:06 -04:00
Matthias Clasen
f0782d72df flatpak-remote-ls docs: Add cross-references 2016-06-09 22:52:06 -04:00
Matthias Clasen
9a4fabed69 Fix a typo 2016-06-09 22:52:06 -04:00
Matthias Clasen
79365a7407 flatpak run docs: Fix formatting of references
These need to be comma-separated.
2016-06-09 22:52:06 -04:00
Matthias Clasen
d40253444a flatpak-builder docs: fix nonexisting reference
flatpak doesn't have a build-build command.
2016-06-09 22:34:32 -04:00
Alexander Larsson
bd485fbc01 builder: Report error details when failing to checkout cache. 2016-06-09 17:45:44 +02:00
Alexander Larsson
5e95d81d45 Allow access to all portals 2016-06-09 16:03:54 +02:00
Alexander Larsson
c800c59c54 test-builder: Test an empty module 2016-06-09 12:43:31 +02:00
Alexander Larsson
5eb671aac4 builder: Warn for duplicate module names 2016-06-09 12:43:31 +02:00
Alexander Larsson
56cd2940aa Merge pull request #95 from matthiasclasen/manifest-docs
consider sources
2016-06-09 12:32:19 +02:00
Alexander Larsson
3fdfeacd5d Merge pull request #102 from matthiasclasen/recursive-docs
Document recursive modules and includes
2016-06-09 12:32:04 +02:00
Matthias Clasen
991c6b837a Document recursive modules and includes 2016-06-09 06:27:44 -04:00
Alexander Larsson
c81e43fa09 tests/test-builder: Test recursive modules 2016-06-09 12:10:52 +02:00
Alexander Larsson
1ddd173507 lib: Fix NOT_INSTALLED error when updating 2016-06-09 12:04:45 +02:00
Alexander Larsson
b7ae30a77e Merge pull request #100 from matthiasclasen/return-value
Fix a case of NULL<>FALSE confusion
2016-06-09 11:46:16 +02:00
Alexander Larsson
375565e567 Merge pull request #101 from matthiasclasen/recursive-modules
Support recursive modules
2016-06-09 11:38:11 +02:00
Matthias Clasen
99e4f83e33 Allow inclusions in the module list
When we see a string in the modules array, parse it as a json
file and use the resulting BuilderModule object.
2016-06-09 01:01:37 -04:00
Matthias Clasen
5225e7b1d0 manifest: Prepare expand_modules to report errors
Move the expand_modules call from the modules setter to
builder_manifest_start, where we have a chance to report
errors.
2016-06-09 00:29:02 -04:00
Matthias Clasen
e25e379a2a manifest: expand module list
Linearize the tree of modules and submodules when the modules
are set on the manifest, while filtering out disabled modules
at the same time.

Skip source-less modules when building; this makes it possible
to have modules that only contain submodules.

With this approach, we use the tree structure of modules for
serializing and deserializing to and from json, while using
a linear list of modules for building.
2016-06-08 23:56:38 -04:00
Matthias Clasen
2757c63fea Add a modules property to BuilderModule
This will let us load modules recursively.
2016-06-08 23:56:38 -04:00
Matthias Clasen
9a8eef8597 manifest: Skip source-less modules when building
Building such modules won't produce anything. And future
commits will make source-less modules useful to support.
2016-06-08 23:56:38 -04:00
Matthias Clasen
914b841481 module: Be a bit more robust
When we call builder_module_cleanup_collect on a module that
has no changes, we shouldn't crash.
2016-06-08 23:55:57 -04:00
Matthias Clasen
26b083333a Fix a case of NULL<>FALSE confusion
This causes a compiler warning.
2016-06-08 20:05:26 -04:00
Alexander Larsson
70093d426f lib: Fix crash on install/update due to uninitialized dir->repo 2016-06-08 13:49:01 +02:00
Alexander Larsson
bd66da0dad builder: Add support for patching mtime in python bytecode headers
This makes them work at runtime (as the mtime will then be 0) and
makes builds more repeatable.
2016-06-08 13:28:27 +02:00
Alexander Larsson
959fec1cd3 Zero out mtime when commiting
This means we get the same behaviour as if we checked out of
the cache. Also, its the same as the final behaviour will be
when running in flatpak.
2016-06-08 13:14:09 +02:00
Alexander Larsson
4990dd5f86 builder: Manually zero mtime of cache checkout
This works around an ostree bug where this didn't happen in the
mismatched mode (regular checkout, user repo) we're using.
2016-06-08 11:11:24 +02:00
Alexander Larsson
cc08083543 common: Add flatpak_zero_mtime helper
This recursively sets the mtime to 0.
2016-06-08 11:11:01 +02:00