From 1b03fb4b211fd5ea5da0cacd50ddb36d8f6cfbd8 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Tue, 28 Jun 2016 14:02:33 -0400 Subject: [PATCH] debian: merge packaging in main subiquity tree. Signed-off-by: Mathieu Trudel-Lapierre --- .gitignore | 1 - debian/changelog | 68 ++++++++++++++++++++++ debian/compat | 1 + debian/control | 102 +++++++++++++++++++++++++++++++++ debian/copyright | 25 ++++++++ debian/docs | 2 + debian/rules | 24 ++++++++ debian/source/format | 1 + debian/subiquity-tools.install | 1 + debian/subiquity-tools.links | 2 + debian/subiquity.install | 1 + debian/subiquity.links | 1 + 12 files changed, 228 insertions(+), 1 deletion(-) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/docs create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/subiquity-tools.install create mode 100644 debian/subiquity-tools.links create mode 100644 debian/subiquity.install create mode 100644 debian/subiquity.links diff --git a/.gitignore b/.gitignore index 362dd173..b737d131 100644 --- a/.gitignore +++ b/.gitignore @@ -61,7 +61,6 @@ installer/*.img installer/*.img_* logs/* venv -debian .pybuild # probert as its pulled externally diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 00000000..5a4e3c61 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,68 @@ +subiquity (0.0.5+1467127840.a721eba~cy1) yakkety; urgency=medium + + * Release 0.0.6 snapshot: port for yakkety: + - Include firstboot support. + + -- Mathieu Trudel-Lapierre Tue, 28 Jun 2016 11:32:03 -0400 + +subiquity (0.0.5) wily; urgency=medium + + * Release 0.0.5 + * New UX/Models: bcache, lvm, identity + * Geninstaller updated to work with latest curtin + * Fix button movement when scaling UI + * Switch back to async curtin install (two stage) + * Fixed issues: #77, #88 + + -- Ryan Harper Tue, 05 Jan 2016 20:30:11 -0600 + +subiquity (0.0.4) wily; urgency=medium + + * Release 0.0.4 + * Refactor signals for improved navigation (escape always works) + * Updated Network model to support manual configuration + * Added Bonding UX panels + * Fixed issues: #71, #73, #99, #100, #101, #103, #105, #106, #107, #108, + #109, #111 + + -- Ryan Harper Wed, 11 Nov 2015 09:14:21 -0600 + +subiquity (0.0.3) wily; urgency=medium + + * Release 0.0.3 + * Fix RAID install + * geninstaller: install curtin as deb + * geninstaller: pre-install curtin deps in installer overlay + * geninstaller: shrink the size of the rootfs partition + * Fixed issues: #63, #64, #67, #69, #70, #72, #74, #75, #76, #77, #78 + + -- Ryan Harper Wed, 28 Oct 2015 09:58:39 -0500 + +subiquity (0.0.2) wily; urgency=medium + + * Release 0.0.2 + * Network Configuration UX + * RAID/mdadm UX + * Updated Installer spinner + * Detection on failure when running curtin + + -- Ryan Harper Tue, 20 Oct 2015 18:34:20 -0500 + +subiquity (0.0.1-0ubuntu3) wily; urgency=medium + + * Break subiquity-{gen|run}installer into -tools package (Closes: #80) + + -- Ryan Harper Tue, 20 Oct 2015 17:02:47 -0500 + +subiquity (0.0.1-0ubuntu2) wily; urgency=medium + + * Add curtin to package deps + * Find curtin and install source dynamically (Closes: #64) + + -- Ryan Harper Wed, 07 Oct 2015 08:49:39 -0500 + +subiquity (0.0.1-0ubuntu1) wily; urgency=medium + + * Initial build. + + -- Adam Stokes Mon, 17 Aug 2015 14:01:12 -0400 diff --git a/debian/compat b/debian/compat new file mode 100644 index 00000000..ec635144 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 00000000..eba66346 --- /dev/null +++ b/debian/control @@ -0,0 +1,102 @@ +Source: subiquity +Section: admin +Priority: extra +Maintainer: Ubuntu Developers +Build-Depends: bzr, + debhelper (>= 9), + dh-python, + git, + python3, + python3-setuptools, + python3-yaml +Standards-Version: 3.9.5 +Homepage: https://github.com/CanonicalLtd/subiquity +X-Python3-Version: >= 3.3 +Vcs-Browser: https://github.com/CanonicalLtd/subiquity +Vcs-Git: https://github.com/CanonicalLtd/subiquity.git + +Package: subiquity +Architecture: amd64 +Depends: curtin, + probert, + python3-tornado, + python3-urwid (>= 1.2.1), + python3-yaml, + ${misc:Depends}, + ${python3:Depends} +Description: Ubuntu Server Installer + SUbiquity is an installer system for servers, embedded devices and desktops + or laptops meant to build systems as quickly as possible for users to reach + a point where their system is usable. + . + By default, subiquity provides a "first boot" experience that allows users + to do initial system configuration such as adding users and login settings, + along with doing basic network configuration. It can also be used to build + a new system from the ground up, partitioning and copying a disk image to + the storage device selected by the user. + . + This package provides the installer routines for bootstrapping a system + with the Subiquity the server installer UI. + +Package: subiquity-installer +Architecture: amd64 +Depends: subiquity, + ${misc:Depends} +Description: Ubuntu Server Installer - new install mode + SUbiquity is an installer system for servers, embedded devices and desktops + or laptops meant to build systems as quickly as possible for users to reach + a point where their system is usable. + . + By default, subiquity provides a "first boot" experience that allows users + to do initial system configuration such as adding users and login settings, + along with doing basic network configuration. It can also be used to build + a new system from the ground up, partitioning and copying a disk image to + the storage device selected by the user. + . + This package provides the files and tools required to do an install of + Ubuntu Server on a new system. + +Package: subiquity-tools +Architecture: amd64 +Depends: bzr, + ${misc:Depends}, + cloud-image-utils, + devscripts, + extlinux, + gdisk, + git, + grub-efi-amd64-signed, + grub2-common, + kpartx, + parted, + pep8, + pyflakes, + python-all, + python-mock, + python-nose, + python-oauthlib, + python-yaml, + python3-mock, + python3-nose, + python3-setuptools, + qemu-utils, + shim, + shim-signed, + simplestreams, + subiquity, + syslinux-common, + ubuntu-cloudimage-keyring, + ${python3:Depends} +Description: Ubuntu Server Installer + SUbiquity is an installer system for servers, embedded devices and desktops + or laptops meant to build systems as quickly as possible for users to reach + a point where their system is usable. + . + By default, subiquity provides a "first boot" experience that allows users + to do initial system configuration such as adding users and login settings, + along with doing basic network configuration. It can also be used to build + a new system from the ground up, partitioning and copying a disk image to + the storage device selected by the user. + . + This package provides the installer which all the necessary utilities to + complete a new installation. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 00000000..d68f21c8 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,25 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: subiquity +Source: https://github.com/CanonicalLtd/subiquity + +Files: * +Copyright: Copyright 2015, Canonical Ltd. +License: AGPL-3.0+ + +Files: debian/* +Copyright: Copyright 2015, Canonical Ltd. +License: AGPL-3.0+ + +License: AGPL-3.0+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + . + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . diff --git a/debian/docs b/debian/docs new file mode 100644 index 00000000..b9de7ba9 --- /dev/null +++ b/debian/docs @@ -0,0 +1,2 @@ +README.md +examples diff --git a/debian/rules b/debian/rules new file mode 100755 index 00000000..736b123c --- /dev/null +++ b/debian/rules @@ -0,0 +1,24 @@ +#!/usr/bin/make -f + +export PYBUILD_NAME=subiquity +export PYBUILD_DISABLE_python2=1 +export PYBUILD_INSTALL_DIR=usr/share/subiquity/ +export PYBUILD_INSTALL_ARGS_python3=--install-lib=usr/share/subiquity/ \ + --install-data=usr/ \ + --root=$(CURDIR)/debian/subiquity/ \ + --no-compile -O0 + +%: + dh $@ --with python3 --buildsystem=pybuild + +override_dh_clean: + rm -f .subiquity/subiquity-debug.log installer/geninstaller.log + rm -rf probert/ + +override_dh_python3: + dh_python3 --ignore-shebangs +override_dh_installinit: + dh_installinit --no-start + +override_dh_auto_test: + @echo "No tests." diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000..89ae9db8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/debian/subiquity-tools.install b/debian/subiquity-tools.install new file mode 100644 index 00000000..646062c4 --- /dev/null +++ b/debian/subiquity-tools.install @@ -0,0 +1 @@ +installer usr/share/subiquity/ diff --git a/debian/subiquity-tools.links b/debian/subiquity-tools.links new file mode 100644 index 00000000..c0ca7997 --- /dev/null +++ b/debian/subiquity-tools.links @@ -0,0 +1,2 @@ +/usr/share/subiquity/installer/geninstaller /usr/bin/subiquity-geninstaller +/usr/share/subiquity/installer/runinstaller /usr/bin/subiquity-runinstaller diff --git a/debian/subiquity.install b/debian/subiquity.install new file mode 100644 index 00000000..c23d363a --- /dev/null +++ b/debian/subiquity.install @@ -0,0 +1 @@ +bin/subiquity-tui usr/share/subiquity diff --git a/debian/subiquity.links b/debian/subiquity.links new file mode 100644 index 00000000..2e8db79b --- /dev/null +++ b/debian/subiquity.links @@ -0,0 +1 @@ +/usr/share/subiquity/subiquity-tui /usr/bin/subiquity