Drop crufty .deb packages from the source package build
The binary packages from the subiquity source are unused with the exception of console-conf (+subiquitycore) which is input into the core snap build; and subiquity-tools is particularly bad as it has a hard-coded dependency on python-all, which is not at all normal for a runtime package. So just stop building these unmaintained binaries, and only build the ones we actually use.
This commit is contained in:
Steve Langasek
parent
dff7c1f67c
commit
4129f6f5ff
|
|
@ -17,29 +17,6 @@ Vcs-Browser: https://github.com/CanonicalLtd/subiquity
|
|||
Vcs-Git: https://github.com/CanonicalLtd/subiquity.git
|
||||
XS-Ubuntu-Use-Langpack: yes
|
||||
|
||||
Package: subiquity
|
||||
Architecture: all
|
||||
Depends: curtin,
|
||||
iso-codes,
|
||||
python3,
|
||||
subiquitycore,
|
||||
probert-storage,
|
||||
${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: subiquitycore
|
||||
Architecture: all
|
||||
Depends: probert-network,
|
||||
|
|
@ -78,47 +55,3 @@ Description: Ubuntu Core Pre-Ownership Configurator
|
|||
.
|
||||
This package provides the setup routines for pre-ownership configuration of
|
||||
a system.
|
||||
|
||||
Package: subiquity-tools
|
||||
Architecture: all
|
||||
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,
|
||||
${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 which all the necessary utilities to
|
||||
complete a new installation.
|
||||
|
|
|
|||
|
|
@ -30,16 +30,6 @@ override_dh_installinit:
|
|||
install -m 0644 $(CURDIR)/debian/console-conf.conf $(CURDIR)/debian/console-conf/lib/systemd/system/getty@.service.d/
|
||||
mkdir $(CURDIR)/debian/console-conf/lib/systemd/system/serial-getty@.service.d/
|
||||
install -m 0644 $(CURDIR)/debian/console-conf-serial.conf $(CURDIR)/debian/console-conf/lib/systemd/system/serial-getty@.service.d/
|
||||
dh_installsystemd --no-start --name=subiquity
|
||||
dh_installsystemd --no-start --name=serial-subiquity@
|
||||
dh_installsystemd --no-start --name=subiquity-debug@
|
||||
mkdir $(CURDIR)/debian/subiquity/lib/systemd/system/getty@tty1.service.d/
|
||||
install -m 0644 $(CURDIR)/debian/subiquity-tty1.conf $(CURDIR)/debian/subiquity/lib/systemd/system/getty@tty1.service.d/
|
||||
mkdir $(CURDIR)/debian/subiquity/lib/systemd/system/getty@.service.d/
|
||||
install -m 0644 $(CURDIR)/debian/subiquity-ttyN.conf $(CURDIR)/debian/subiquity/lib/systemd/system/getty@.service.d/
|
||||
ln -s /dev/null $(CURDIR)/debian/subiquity/lib/systemd/system/subiquity-debug@tty1.service
|
||||
mkdir $(CURDIR)/debian/subiquity/lib/systemd/system/serial-getty@.service.d/
|
||||
install -m 0644 $(CURDIR)/debian/subiquity-serial.conf $(CURDIR)/debian/subiquity/lib/systemd/system/serial-getty@.service.d/
|
||||
|
||||
override_dh_auto_test:
|
||||
@echo "No tests."
|
||||
|
|
|
|||
|
|
@ -1,2 +0,0 @@
|
|||
[Service]
|
||||
ExecStartPre=/bin/systemctl start serial-subiquity@%i.service
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/usr/share/subiquity/installer/geninstaller /usr/bin/subiquity-geninstaller
|
||||
/usr/share/subiquity/installer/runinstaller /usr/bin/subiquity-runinstaller
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
[Service]
|
||||
ExecStartPre=/bin/systemctl start subiquity.service
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
[Service]
|
||||
ExecStartPre=/bin/systemctl start subiquity-debug@%i.service
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
debian/tmp/usr/bin/subiquity-* usr/share/subiquity
|
||||
usr/share/subiquity/subiquity
|
||||
|
|
@ -1 +0,0 @@
|
|||
/usr/share/subiquity/subiquity-tui /usr/bin/subiquity
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
[Unit]
|
||||
Description=Subiquity, the installer for Ubuntu Server %I
|
||||
BindsTo=dev-%i.device
|
||||
After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service
|
||||
After=rc-local.service
|
||||
ConditionPathExists=!/run/subiquity/complete
|
||||
StartLimitInterval=0
|
||||
|
||||
[Service]
|
||||
Environment=PYTHONPATH=/usr/share/subiquity
|
||||
ExecStartPre=/bin/systemctl stop serial-getty@%I
|
||||
ExecStart=/sbin/agetty -i -n --keep-baud -l /usr/share/subiquity/subiquity-tui --login-options "--serial" 115200,38400,9600 %I $TERM
|
||||
ExecStopPost=/bin/systemctl start serial-getty@%I
|
||||
Type=idle
|
||||
Restart=always
|
||||
RestartSec=0
|
||||
UtmpIdentifier=%I
|
||||
TTYPath=/dev/%I
|
||||
TTYReset=yes
|
||||
TTYVHangup=yes
|
||||
KillMode=process
|
||||
IgnoreSIGPIPE=no
|
||||
SendSIGHUP=yes
|
||||
|
||||
#TTYVTDisallocate=yes
|
||||
#KillMode=process
|
||||
#Restart=always
|
||||
#StandardInput=tty-force
|
||||
#StandardOutput=tty
|
||||
#StandardError=tty
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
[Unit]
|
||||
Description=Subiquity debug shell %I
|
||||
After=systemd-user-sessions.service plymouth-quit-wait.service
|
||||
After=rc-local.service
|
||||
IgnoreOnIsolate=yes
|
||||
ConditionPathExists=/dev/tty0
|
||||
ConditionPathExists=!/run/subiquity/complete
|
||||
|
||||
[Service]
|
||||
Environment=PYTHONPATH=/usr/share/subiquity
|
||||
ExecStartPre=/bin/systemctl stop getty@%I
|
||||
ExecStart=/sbin/agetty -i -n --noclear -l /usr/share/subiquity/subiquity-debug %I $TERM
|
||||
ExecStopPost=/bin/systemctl start getty@%I
|
||||
Type=idle
|
||||
Restart=always
|
||||
RestartSec=0
|
||||
UtmpIdentifier=%I
|
||||
TTYPath=/dev/%I
|
||||
TTYReset=yes
|
||||
TTYVHangup=yes
|
||||
TTYVTDisallocate=yes
|
||||
KillMode=process
|
||||
IgnoreSIGPIPE=no
|
||||
SendSIGHUP=yes
|
||||
|
||||
#KillMode=process
|
||||
#Restart=always
|
||||
#StandardInput=tty-force
|
||||
#StandardOutput=tty
|
||||
#StandardError=tty
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
[Unit]
|
||||
Description=Subiquity, the installer for Ubuntu Server
|
||||
After=systemd-user-sessions.service plymouth-quit-wait.service
|
||||
After=rc-local.service
|
||||
IgnoreOnIsolate=yes
|
||||
ConditionPathExists=/dev/tty0
|
||||
ConditionPathExists=!/run/subiquity/complete
|
||||
|
||||
[Service]
|
||||
Environment=PYTHONPATH=/usr/share/subiquity
|
||||
ExecStartPre=/usr/share/subiquity/subiquity-loadkeys
|
||||
ExecStartPre=/bin/systemctl stop getty@tty1
|
||||
ExecStart=/sbin/agetty -i -n --noclear -l /usr/share/subiquity/subiquity-tui tty1 $TERM
|
||||
ExecStopPost=/bin/systemctl start getty@tty1
|
||||
Type=idle
|
||||
Restart=always
|
||||
RestartSec=0
|
||||
UtmpIdentifier=tty1
|
||||
TTYPath=/dev/tty1
|
||||
TTYReset=yes
|
||||
TTYVHangup=yes
|
||||
TTYVTDisallocate=yes
|
||||
KillMode=process
|
||||
IgnoreSIGPIPE=no
|
||||
SendSIGHUP=yes
|
||||
|
||||
#KillMode=process
|
||||
#Restart=always
|
||||
#StandardInput=tty-force
|
||||
#StandardOutput=tty
|
||||
#StandardError=tty
|
||||
Loading…
Reference in New Issue