summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2023-08-31 00:18:15 +0200
committerCarl Hetherington <cth@carlh.net>2023-08-31 00:18:15 +0200
commit8f354f7412aeed8f856d11de0da04a4016b610f7 (patch)
tree933d779e6f5dbf69360a5d4072be51552ef43e5d
parent5c763b921cfe28da68d988dc59ef7d0c025cae75 (diff)
Go back to running Flatpak outside docker; running it inside seems even more painful.
-rwxr-xr-xcdist10
1 files changed, 6 insertions, 4 deletions
diff --git a/cdist b/cdist
index a7af8ad..d4e6523 100755
--- a/cdist
+++ b/cdist
@@ -724,11 +724,9 @@ class AppImageTarget(LinuxTarget):
self.privileged = True
-class FlatpakTarget(LinuxTarget):
+class FlatpakTarget(Target):
def __init__(self, project, checkout, work):
- super(FlatpakTarget, self).__init__('ubuntu', '22.04', 64, work)
- self.platform = 'flatpak'
- self.privileged = True
+ super(FlatpakTarget, self).__init__('flatpak')
self.build_dependencies = False
self.project = project
self.checkout = checkout
@@ -737,6 +735,10 @@ class FlatpakTarget(LinuxTarget):
globals.use_git_reference = False
if config.has('flatpak_state_dir'):
self.mount(config.get('flatpak_state_dir'))
+
+ def command(self, c):
+ log_normal('host -> %s' % c)
+ command('%s %s' % (self.variables_string(), c))
def setup(self):
super().setup()