Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

debian: pull in systemd binaries instead of building it from scratch #182

Merged
merged 11 commits into from
Jun 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions bin/ubuntu-core-initramfs
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,6 @@ def create_efi(parser, args):
parser.error("--stub is required, and one was not automatically detected")
if args.root:
args.stub = path_join_make_rel_paths(args.root, args.stub)
args.sbat = path_join_make_rel_paths(args.root, args.sbat)
xnox marked this conversation as resolved.
Show resolved Hide resolved
args.kernel = path_join_make_rel_paths(args.root, args.kernel)
args.initrd = path_join_make_rel_paths(args.root, args.initrd)
args.key = path_join_make_rel_paths(args.root, args.key)
Expand Down Expand Up @@ -392,8 +391,6 @@ def create_efi(parser, args):
]
# TODO add .splash
objcopy_cmd += [
"--add-section", ".sbat=%s" % args.sbat,
"--set-section-flags", ".sbat=readonly,data",
"--add-section", ".linux=%s" % args.kernel,
"--set-section-flags", ".linux=readonly,data",
"--add-section", ".initrd=%s" % args.initrd,
Expand Down Expand Up @@ -434,8 +431,6 @@ def main():
)
efi_parser.add_argument("--root", help="path to root")
efi_parser.add_argument("--stub", help="path to stub")
efi_parser.add_argument("--sbat", help="path to sbat",
default="/usr/lib/ubuntu-core-initramfs/efi/sbat.txt")
if suffix:
efi_parser.set_defaults(
stub="/usr/lib/ubuntu-core-initramfs/efi/linux%s.efi.stub" % suffix
Expand Down
71 changes: 14 additions & 57 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -2,74 +2,31 @@ Source: ubuntu-core-initramfs
Section: utils
Priority: optional
Maintainer: Dimitri John Ledkov <[email protected]>
Build-Depends: debhelper-compat (= 13), dh-python, python3:any, dracut-core, quilt, busybox-initramfs,
util-linux,
e2fsprogs,
fdisk,
Build-Depends: debhelper-compat (= 13), dh-python, python3:any, dracut-core, busybox-initramfs,
amd64-microcode [amd64],
dbus,
dosfstools,
dmsetup,
mount,
pkg-config,
xsltproc,
docbook-xsl,
docbook-xml,
dosfstools,
e2fsprogs,
fakeroot,
fdisk,
fonts-ubuntu,
meson (>= 0.52.1),
gettext,
gperf,
git,
gnu-efi [amd64 i386 arm64 armhf riscv64],
libcap-dev (>= 1:2.24-9~),
libpam0g-dev,
libapparmor-dev (>= 2.13) <!stage1>,
libidn2-dev <!stage1>,
libiptc-dev <!stage1>,
libaudit-dev <!stage1>,
libdbus-1-dev (>= 1.3.2) <!nocheck> <!noinsttest>,
libcryptsetup-dev (>= 2:1.6.0) <!stage1>,
libselinux1-dev (>= 2.1.9),
libacl1-dev,
liblzma-dev,
liblz4-dev (>= 0.0~r125),
liblz4-tool <!nocheck>,
libbz2-dev <!stage1>,
zlib1g-dev <!stage1> | libz-dev <!stage1>,
libcurl4-gnutls-dev <!stage1> | libcurl-dev <!stage1>,
libmicrohttpd-dev <!stage1>,
libgnutls28-dev <!stage1>,
libpcre2-dev <!stage1>,
libgcrypt20-dev,
libkmod-dev (>= 15),
libblkid-dev (>= 2.24),
libmount-dev (>= 2.30),
libseccomp-dev (>= 2.3.1) [amd64 arm64 armel armhf i386 mips mipsel mips64 mips64el x32 powerpc ppc64 ppc64el riscv64 s390x],
libdw-dev (>= 0.158) <!stage1>,
libpolkit-gobject-1-dev <!stage1>,
libzstd-dev (>= 1.4.0),
linux-base <!nocheck>,
acl <!nocheck>,
plymouth-label-ft,
plymouth-theme-spinner,
python3:native,
python3-jinja2:native,
python3-lxml:native,
python3-pyparsing:native <!nocheck> | python3-pyparsing <!nocheck>,
python3-evdev:native <!nocheck>,
tzdata <!nocheck>,
libcap2-bin <!nocheck>,
iproute2 <!nocheck>,
zstd <!nocheck>,
gawk <!nocheck>,
amd64-microcode [amd64],
intel-microcode [amd64],
kmod,
libgcc-s1,
mount,
plymouth-label-ft,
plymouth-theme-spinner,
squashfs-tools,
systemd,
systemd-boot-efi,
systemd-bootchart,
cryptsetup-bin,
systemd-sysv,
tar,
golang-go, indent, libapparmor-dev, libcap-dev, libfuse-dev, libglib2.0-dev, liblzma-dev, liblzo2-dev, libseccomp-dev, libudev-dev, openssh-client, pkg-config, python3, python3-docutils, python3-markdown, squashfs-tools, tzdata, udev, xfslibs-dev
udev,
util-linux
Standards-Version: 4.4.1
Homepage: https://launchpad.net/ubuntu-core-initramfs

Expand Down
3 changes: 1 addition & 2 deletions debian/install
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@ bin/ubuntu-core-initramfs usr/bin
postinst.d etc/kernel/
snakeoil/* usr/lib/ubuntu-core-initramfs/snakeoil/
debian/tmp/* usr/lib/ubuntu-core-initramfs/main
debian/tmp/usr/lib/systemd/boot/efi/linux*.efi.stub usr/lib/ubuntu-core-initramfs/efi/
debian/sbat.txt usr/lib/ubuntu-core-initramfs/efi/
debian/tmp-efi/* usr/lib/ubuntu-core-initramfs/efi/
modules usr/lib/ubuntu-core-initramfs/
Loading