Skip to content
Snippets Groups Projects
Commit 2e77bac5 authored by Louis-Francis Ratté-Boulianne's avatar Louis-Francis Ratté-Boulianne
Browse files

Small fixes to bundle creation


 * Directory for apps is Applications not Application
 * Don't set --sysconfdir so the AppArmor profile is in the
   right directory

Signed-off-by: default avatarLouis-Francis Ratté-Boulianne <lfrb@collabora.com>
Reviewed-by: default avatarSjoerd Simons <sjoerd.simons@collabora.co.uk>
Differential Revision: https://phabricator.apertis.org/D5280
parent 162121ef
No related branches found
No related tags found
No related merge requests found
......@@ -700,8 +700,7 @@ class Project:
env = os.environ.copy()
triplet = TargetTriplet(sysroot.version.arch)
args = ["./configure"]
args += ["--prefix=/Application/" + self.bundle_id]
args += ["--sysconfdir=/var/Applications/" + self.bundle_id + "/etc"]
args += ["--prefix=/Applications/" + self.bundle_id]
args += ["--localstatedir=/var/Applications/" + self.bundle_id + "/var"]
if debug:
......@@ -806,7 +805,7 @@ class Bundle:
f.write("X-Apertis-BundleVersion={0}".format(bundle.version))
os.makedirs(os.path.join(bundledir, 'export'))
project.install(builddir)
shutil.copytree(os.path.join(builddir, 'Application', bundle.id),
shutil.copytree(os.path.join(builddir, 'Applications', bundle.id),
os.path.join(bundledir, 'files'))
cmd = ['flatpak', 'build-export', repodir, bundledir]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment