Dan Bungert
9179777aa2
os-prober: use snapified source
...
Use my branch of os-prober which adds env variables for finding the lib
& share directories. And set those env variables.
2022-02-28 15:56:04 -07:00
Dan Bungert
3b6f6024ae
os-prober: build from a git
...
Build os-prober from a git repo instead of staging the focal version.
Point to my mirror of os-prober as salsa is currently down.
2022-02-28 15:00:25 -07:00
Michael Hudson-Doyle
de4c2af81e
snapcraft.yaml: remove bson from python-packages
2022-02-23 10:12:21 +13:00
Dan Bungert
4f012918f8
Revert probert again to remove os-prober usage
...
os-prober is leaving around invalid devices and we don't know what to do
about it yet, but we do know that we don't require os-prober for
20.04.4. Back this out. LP: #1961640 LP: #1961628
2022-02-22 13:31:14 -07:00
Dan Bungert
4927affbe8
snapcraft: better file selection for os-prober sed
2022-01-24 13:18:49 -07:00
Dan Bungert
54ca91038e
snapcraft: show os-prober as available app
2022-01-24 12:37:48 -07:00
Dan Bungert
8318fc4617
Revert "os-prober: patch instead of sed"
...
This reverts commit 7bdeb6707c
.
2022-01-24 12:18:41 -07:00
Olivier Gayot
1fce021585
Bump curtin version to fix APT preferences being discarded
...
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2022-01-21 10:07:16 +01:00
Dan Bungert
f0907971ed
Merge pull request #1145 from dbungert/os-prober-snap
...
snapcraft: add os-prober
2022-01-20 12:34:09 -07:00
Dan Bungert
4a672e071e
Merge pull request #1158 from ogayot/bind-uac-into-subiquity-snap
...
Embed ubuntu-advantage-tools into Subiquity snap and use it
2022-01-13 13:01:03 -07:00
Olivier Gayot
6e0c9821fe
snapcraft: pickup curtin's support for apt_preferences
...
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2022-01-13 09:32:42 +01:00
Dan Bungert
7bdeb6707c
os-prober: patch instead of sed
2022-01-12 13:33:07 -07:00
Dan Bungert
6bf9b8f734
snapcraft: rev probert for os-prober
2022-01-11 14:34:08 -07:00
Dan Bungert
05c8c70483
snapcraft: +os-prober
2022-01-11 14:34:08 -07:00
Olivier Gayot
1995dd002a
Add ubuntu-advantage-tools as stage-package
...
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2022-01-11 11:12:10 +01:00
Dan Bungert
90d764af36
probert: rollback to pre os-prober
...
Rollback the Probert version until os-prober is correctly present in the
Subiquity snap.
2021-12-08 16:18:36 -07:00
Dan Bungert
49c20f7894
probert: rev for os-prober
2021-12-07 11:46:28 -07:00
Dan Bungert
c332d62e40
Merge pull request #1130 from dbungert/curtin-rev-lsblk
...
snapcraft: pickup curtin lsblk fix
2021-11-22 16:55:34 -07:00
Dan Bungert
00c4f0c0a3
snapcraft: pickup curtin lsblk fix
2021-11-19 16:02:40 -07:00
Dan Bungert
cf199fbc4d
snapcraft: remove python links from snap bin dir
...
The python links in the bin dir of the snap were resolving to system
python instead of the python binary found at usr/bin. This appears to
be the root cause of why python scripts would fail to find their own
resources, such as ssh-import-id and lsb_release.
2021-11-19 15:50:14 -07:00
Michael Hudson-Doyle
be57dc9da0
fix offline installs
2021-11-17 11:20:18 +13:00
Dan Bungert
5b425b2ea0
ssh: fix PYTHONPATH
2021-10-07 15:57:37 -06:00
Dan Bungert
be158a375f
snapcraft: environment and package fixes
...
* adjust environment to set PYTHONPATH to pick up site-packages
* add more required packages
* add script for subiquity-server, and set PYTHONPATH there,
so that the PYTHONPATH takes effect
2021-10-01 13:59:10 -06:00
Michael Hudson-Doyle
8de369ece2
snapcraft: change base to core20
2021-10-01 13:29:31 -06:00
Michael Hudson-Doyle
288a7e23f4
update curtin
2021-08-24 11:45:15 +12:00
Michael Hudson-Doyle
fbfbf67eb5
update curtin
2021-08-12 13:11:04 +12:00
Michael Hudson-Doyle
0bdb965444
update curtin
2021-08-11 10:34:22 +12:00
Michael Hudson-Doyle
31cceabba9
update curtin, you know the drill
2021-08-04 12:51:49 +12:00
Dan Bungert
9d3c156686
Update probert for bitlocker changes
2021-08-02 19:02:09 -06:00
Michael Hudson-Doyle
e973b87b92
grab another 2 curtin commits
2021-08-03 12:30:23 +12:00
Michael Hudson-Doyle
ae7af3ed4c
update curtin to get raid, zipl config, unmounting fixes
2021-08-02 14:39:29 +12:00
Michael Hudson-Doyle
c340c6db22
update curtin
...
this brings in the unmounting fix and lets PYTHON be set in the
environment to choose which python to use
2021-07-23 12:26:49 +12:00
Michael Hudson-Doyle
ab97297009
set environment variables in snapcraft.yaml not wrappers
2021-07-14 12:02:45 +12:00
Dan Bungert
4cbfb7f18f
Abstract resource file lookup relative to SNAP ( #998 )
...
* Abstract resource file lookup relative to SNAP
Using SNAP to find the resource files is a bit of an odd requirement for
non-subiquity clients. Start abstracting that away so it's easier to
change later.
Also move loadkeys to lookup from this, since the previous solution is
still a problem for ubuntu-desktop-installer.
* Move loadkeys / configure-apt to bin
loadkeys / configure-apt are in usr/bin only when we specially put them
there by way of snapcraft, which makes things a little harder on
non-subiquity clients. Move them to bin, which is to say don't have
snapcraft put them in usr/bin.
2021-07-13 16:14:31 -06:00
Michael Hudson-Doyle
aac56ae776
update curtin to get some raid container fixes
2021-07-07 08:40:33 +12:00
Michael Hudson-Doyle
8e253fb955
remove some apps from the snapcraft.yaml
2021-07-02 11:59:21 +12:00
Michael Hudson-Doyle
5f6695d9d3
add python3-yaml to build-packages (make-kbd-info.py now indirectly requires this)
2021-06-11 14:21:16 +12:00
Michael Hudson-Doyle
c91245600c
update probert
2021-06-10 10:04:41 +12:00
Michael Hudson-Doyle
4c03823b06
update probert to version that has mark-wlan-earlier merged
2021-06-03 11:29:49 +12:00
Michael Hudson-Doyle
4965f1000d
update curtin
2021-04-16 09:12:00 +12:00
Michael Hudson-Doyle
83823515ca
Merge pull request #921 from mwhudson/no-mount-run
...
remove curtin hook to bind mount /run into target now curtin does this
2021-03-31 11:47:20 +13:00
Michael Hudson-Doyle
c6185075c7
update curtin
2021-03-30 09:30:03 +13:00
Michael Hudson-Doyle
fac360b8e7
remove curtin hook to bind mount /run into target now curtin does this
...
Curtin added this in version 19.3 so we can stop doing it.
2021-03-29 14:49:59 +13:00
Michael Hudson-Doyle
5d93eb824a
process keyboard data into api friendly format when building snap
...
This is a bit sideways from the real thing I'm working on which is
moving most of the logic of keyboard handling to the server side but
anyway. This also lets me check some assumptions while processing the
data rather than in the view code.
2021-03-16 16:02:23 +13:00
Michael Hudson-Doyle
d448adb1c1
probert moved to the canonical github org a while ago
2021-02-19 10:33:38 +13:00
Michael Hudson-Doyle
e813726aaa
yaml is bad
2021-01-27 15:20:32 +13:00
Michael Hudson-Doyle
0ff1739d19
use curtin 21.2 release
2021-01-27 14:55:52 +13:00
Michael Hudson-Doyle
a888d823af
pin pyyaml version
2021-01-20 22:33:01 +13:00
Michael Hudson-Doyle
a8c0c5bebd
update curtin and probert branches to commits that contain dasd goodness
2020-12-16 10:24:27 +13:00
Michael Hudson-Doyle
6fe600987c
pin yarl to 1.5.1 when building the snap too
2020-11-04 10:57:22 +13:00
Dimitri John Ledkov
89df170814
Bump probert to fixed json output commit
2020-10-20 12:50:19 +01:00
Michael Hudson-Doyle
c0f0e3caaa
add subiquity-server to snap
2020-09-23 13:29:01 +12:00
Michael Hudson-Doyle
4638815e45
update to probert tip, adding recognition of CAN nics
2020-08-13 21:25:13 +12:00
Foster "Forst" Snowhill
e90b84b675
snapcraft: add build-essential dependency for probert
...
The core image by default does not include the build-essential package. We need it to build the rtnetlink extension
for probert. If gcc is missing, the following error occurs:
running build_ext
building 'probert._rtnetlink' extension
creating build/temp.linux-x86_64-3.6
creating build/temp.linux-x86_64-3.6/probert
x86_64-linux-gnu-gcc -pthread -DNDEBUG -g -fwrapv -O2 -Wall -g -fstack-protector-strong -Wformat -Werror=format-security -I/usr/include/python3.6m -fPIC -I/root/parts/probert/
install/usr/include/python3.6m -c probert/_rtnetlinkmodule.c -o build/temp.linux-x86_64-3.6/probert/_rtnetlinkmodule.o -I/usr/include/libnl3
unable to execute 'x86_64-linux-gnu-gcc': No such file or directory
error: command 'x86_64-linux-gnu-gcc' failed with exit status
In this commit we include build-essential for the probert build step.
2020-08-02 18:05:33 +02:00
Foster "Forst" Snowhill
304719eb4d
snapcraft: unminimize iso-codes package
...
When building the snap in a clean environment, we start with a minimised core image. This image excludes translation
files, which are needed for the "languagelists" step. The following error will show up when building:
Building languagelists
do not know native name for oc
Failed to run 'override-build': Exit code was 1.
This is due to translation files being excluded by default in /etc/dpkg/dpkg.cfg.d/excludes on minimised systems:
# Drop all translations
path-exclude=/usr/share/locale/*/LC_MESSAGES/*.mo
We now comment this line and reinstall the "iso-codes" package.
2020-08-02 18:05:29 +02:00
Michael Hudson-Doyle
c6fecae958
set PYTHONIOENCODING to utf-8 in snapcraft.yaml for subiquity{,-service}
...
for https://bugs.launchpad.net/ubuntu-z-systems/+bug/1884027
Not really sure why this only shows up now.
2020-06-18 21:36:21 +12:00
Michael Hudson-Doyle
999edebc46
go back to getting curtin from ubuntu/devel branch
2020-06-04 07:34:09 +12:00
Michael Hudson-Doyle
afe22f2982
Merge branch 'master' into better-language-lists
2020-05-21 12:40:28 +12:00
Michael Hudson-Doyle
99ad097306
snapcraft.yaml fixery
2020-05-21 11:54:49 +12:00
Michael Hudson-Doyle
5cb37acefc
make some language lists at snap build time
2020-05-21 11:54:49 +12:00
Michael Hudson-Doyle
48736606ec
inline streamlined version of build_i18n & intltool into our setup.py
...
I found the layers and layers of other tools just confusing.
"python3 setup.py build" generates an identical (apart from timestamp)
POT file and an identical build directory before and after this change.
2020-05-08 15:01:06 +12:00
Michael Hudson-Doyle
cb0f77c33e
update to curtin master
2020-05-07 12:48:53 +12:00
Michael Hudson-Doyle
f3a0ba12bd
update probert to drop --mknodes from vgscan invocation
2020-05-01 13:37:04 +12:00
Michael Hudson-Doyle
12f01405ae
Merge pull request #717 from mwhudson/no-stage-libc6
...
stop staging libc6 now we are core18 based
2020-04-24 13:56:20 +12:00
Michael Hudson-Doyle
73d1136eee
do not stage libnl* packages, they are in the core snap
2020-04-24 13:54:21 +12:00
Michael Hudson-Doyle
1e373563ea
one more curtin hotfix
2020-04-23 10:38:13 +12:00
Dimitri John Ledkov
3f0b7c062b
Ship rharper hotfix for dm-name
2020-04-22 17:33:53 +01:00
Dimitri John Ledkov
d28d32a36a
Update curtin to a hotfix
2020-04-22 17:12:27 +01:00
Michael Hudson-Doyle
69c993e5cb
update curtin
2020-04-22 15:56:28 +12:00
Ryan Harper
7f301dbe7c
snapcraft: override-pull of curtin to inject the git commit hash into version string
2020-04-21 11:27:16 -05:00
Michael Hudson-Doyle
f2b6edbafa
update curtin to needed commit
2020-04-21 12:20:31 +12:00
Michael Hudson-Doyle
874b525b6f
stop staging libc6 now we are core18 based
2020-04-17 15:20:54 +12:00
Michael Hudson-Doyle
ebd8101b59
update curtin
...
this lets us drop efibootmgr from the snap again
2020-04-17 10:33:32 +12:00
Michael Hudson-Doyle
d9e73a17a6
get apport python package and hooks from focal branch
2020-04-16 12:31:03 +12:00
Dimitri John Ledkov
5cca44b70d
Merge pull request #707 from mwhudson/use-apport-hooks-from-snap
...
Use apport hooks from snap
2020-04-15 16:52:00 +01:00
Michael Hudson-Doyle
f604dc245b
make part name better
2020-04-15 17:11:18 +12:00
Michael Hudson-Doyle
85ebbec4fc
use apport hooks from the snap, not the live system
...
also include most hooks in the snap
2020-04-15 16:56:12 +12:00
Dimitri John Ledkov
bd98660d98
Switch to core18
2020-04-12 20:01:58 +01:00
Michael Hudson-Doyle
b540dc1d84
switch to probert and curtin tips to get latest fixes
2020-04-12 08:40:28 +12:00
Michael Hudson-Doyle
c9448bba9d
try to make efibootmgr an optional stage-package
2020-04-02 22:46:15 +13:00
Michael Hudson-Doyle
4212ee41e4
stage efibootmgr for now
2020-04-02 21:44:33 +13:00
Michael Hudson-Doyle
100661b60c
use wipe/preserve refactor commit from curtin
2020-03-27 13:23:10 +13:00
Michael Hudson-Doyle
aca4c513fd
add cloud-init to stage-packages
2020-03-20 14:48:16 +13:00
Michael Hudson-Doyle
3f519870ad
use curtin's ubuntu/devel branch again
...
has the dasd stuff now
2020-02-28 13:50:15 +00:00
Michael Hudson-Doyle
be165d941c
update to probert tip to get dasd goodness
2020-02-26 23:22:51 +13:00
Dimitri John Ledkov
436ee1d76d
Bump curtin to commit with multipath fixes
2020-01-30 23:10:12 +00:00
Michael Hudson-Doyle
9e81562e1f
move to current curtin master, including fix for installing kernels on !amd64
2019-12-17 12:58:25 +13:00
Michael Hudson-Doyle
ff53d86bcc
bump probert to get fix for device deletion crash
2019-12-12 09:21:30 +13:00
Michael Hudson-Doyle
9c0b215b31
use curtin master as of today
2019-12-06 09:32:52 +13:00
Michael Hudson-Doyle
ae033101e6
code for uploading to daisy
2019-11-21 14:54:35 +13:00
Michael Hudson-Doyle
74ef2ad8f6
add a way to create a crash report
2019-11-07 14:47:18 +13:00
Michael Hudson-Doyle
4afb53a7ce
bump probert
2019-11-06 14:59:25 +13:00
Michael Hudson-Doyle
b0d19fc58b
go back to getting curtin from ubuntu/devel branch
2019-11-06 10:34:37 +13:00
Michael Hudson-Doyle
129b855c54
use my curtin branch
2019-10-15 09:50:42 +13:00
Dimitri John Ledkov
dd8de22238
Use 19.2-33-gedfdb1d1 curtin from master for all the bugfixes.
2019-10-09 13:03:34 +01:00
Michael Hudson-Doyle
88946c3c85
go back to getting curtin from ubuntu/devel branch
2019-09-30 14:58:48 +13:00
Michael Hudson-Doyle
c495277642
grab a curtin commit off master to address nvme validation fixes
2019-08-28 12:00:37 +12:00
Michael Hudson-Doyle
492faf6263
update to probert tip to get multipath, lvm, raid fixes
2019-07-18 12:25:52 +12:00
Michael Hudson-Doyle
9a2934cdaa
Go back to using the ubuntu/devel branch of curtin now it has released
2019-07-18 09:34:43 +12:00
Michael Hudson-Doyle
42bff6bf27
use curtin master for now
2019-07-10 09:17:08 +12:00