From 2e77bac586b5a370ee9ceb9790d53fe603691820 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Louis-Francis=20Ratt=C3=A9-Boulianne?= <lfrb@collabora.com>
Date: Wed, 14 Dec 2016 09:41:27 -0500
Subject: [PATCH] Small fixes to bundle creation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Directory for apps is Applications not Application
* Don't set --sysconfdir so the AppArmor profile is in the
right directory
Signed-off-by: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Reviewed-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Differential Revision: https://phabricator.apertis.org/D5280
---
tools/ade | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/tools/ade b/tools/ade
index 5cbf034..103bccd 100755
--- a/tools/ade
+++ b/tools/ade
@@ -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]
--
GitLab