Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-project
Commits
35661cb8
Commit
35661cb8
authored
Nov 23, 2018
by
Jenkins
Browse files
Options
Downloads
Plain Diff
submodules: update nightly branch
parents
cdecdcb4
00f59085
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
client-gnome
+1
-1
1 addition, 1 deletion
client-gnome
daemon
+1
-1
1 addition, 1 deletion
daemon
scripts/make-packaging-target.py
+4
-2
4 additions, 2 deletions
scripts/make-packaging-target.py
with
6 additions
and
4 deletions
client-gnome
@
b56ca1d9
Subproject commit
e77ed099258d66d7b1864e7378ec68b36bbbfb39
Subproject commit
b56ca1d95d0f5ec21c2977b8b94981eae66f0c34
This diff is collapsed.
Click to expand it.
daemon
@
cf3ec8e6
Subproject commit
7ae0214dd74a552090f52d715f290ab6e48421c5
Subproject commit
cf3ec8e60fe9e995f86cb395b0e483a16c1936e9
This diff is collapsed.
Click to expand it.
scripts/make-packaging-target.py
+
4
−
2
View file @
35661cb8
...
@@ -182,18 +182,20 @@ def run_generate_all(parsed_args):
...
@@ -182,18 +182,20 @@ def run_generate_all(parsed_args):
"
distribution
"
:
"
ubuntu_18.10
"
,
"
distribution
"
:
"
ubuntu_18.10
"
,
"
debian_packaging_override
"
:
""
,
"
debian_packaging_override
"
:
""
,
"
output_file
"
:
"
$(DEBIAN_DSC_FILENAME)
"
,
"
output_file
"
:
"
$(DEBIAN_DSC_FILENAME)
"
,
"
options
"
:
"
--privileged
"
,
},
},
{
{
"
distribution
"
:
"
ubuntu_18.10_i386
"
,
"
distribution
"
:
"
ubuntu_18.10_i386
"
,
"
debian_packaging_override
"
:
""
,
"
debian_packaging_override
"
:
""
,
"
output_file
"
:
"
$(DEBIAN_DSC_FILENAME)
"
,
"
output_file
"
:
"
$(DEBIAN_DSC_FILENAME)
"
,
"
options
"
:
"
--privileged
"
,
},
},
{
{
"
distribution
"
:
"
ubuntu_18.10_oci
"
,
"
distribution
"
:
"
ubuntu_18.10_oci
"
,
"
docker_image
"
:
"
ubuntu_18.10
"
,
"
docker_image
"
:
"
ubuntu_18.10
"
,
"
debian_packaging_override
"
:
""
,
"
debian_packaging_override
"
:
""
,
"
output_file
"
:
"
$(DEBIAN_OCI_DSC_FILENAME)
"
,
"
output_file
"
:
"
$(DEBIAN_OCI_DSC_FILENAME)
"
,
"
options
"
:
"
-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR)
"
,
"
options
"
:
"
-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR)
--privileged
"
,
"
version
"
:
"
$(DEBIAN_OCI_VERSION)
"
,
"
version
"
:
"
$(DEBIAN_OCI_VERSION)
"
,
},
},
{
{
...
@@ -201,7 +203,7 @@ def run_generate_all(parsed_args):
...
@@ -201,7 +203,7 @@ def run_generate_all(parsed_args):
"
docker_image
"
:
"
ubuntu_18.10_i386
"
,
"
docker_image
"
:
"
ubuntu_18.10_i386
"
,
"
debian_packaging_override
"
:
""
,
"
debian_packaging_override
"
:
""
,
"
output_file
"
:
"
$(DEBIAN_OCI_DSC_FILENAME)
"
,
"
output_file
"
:
"
$(DEBIAN_OCI_DSC_FILENAME)
"
,
"
options
"
:
"
-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR)
"
,
"
options
"
:
"
-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR)
--privileged
"
,
"
version
"
:
"
$(DEBIAN_OCI_VERSION)
"
,
"
version
"
:
"
$(DEBIAN_OCI_VERSION)
"
,
},
},
# Fedora
# Fedora
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment