diff options
Diffstat (limited to 'debian/extra')
| -rwxr-xr-x | debian/extra/checkout-upstream | 6 | ||||
| -rwxr-xr-x | debian/extra/initramfs-tools/hooks/udev | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/debian/extra/checkout-upstream b/debian/extra/checkout-upstream index 1724fea..68afd43 100755 --- a/debian/extra/checkout-upstream +++ b/debian/extra/checkout-upstream @@ -86,7 +86,7 @@ mkdir -p debian/tmp if [ -n "${UPSTREAM_PULL_REQUEST:-}" ] && [ "${UPSTREAM_REPO}" != "https://github.com/systemd/systemd-stable.git" ]; then git rebase main fi - git submodule update --init --recursive) +) UPSTREAM_VER=$(cd debian/tmp/upstream; git describe | sed 's/^v//;s/-/./g') # clean out original upstream sources @@ -100,10 +100,6 @@ fi if grep -q log-trace debian/tmp/upstream/meson_options.txt; then sed -i "s/option('log-trace', type : 'boolean', value : false/option('log-trace', type : 'boolean', value : true/" debian/tmp/upstream/meson_options.txt fi -# TODO: drop when Jammy is no longer used -if grep -q sshdconfdir debian/tmp/upstream/meson_options.txt; then - sed -i "s/option('sshdconfdir',/option('sshdconfdir', value : 'no',/" debian/tmp/upstream/meson_options.txt -fi # replace with checkout mv debian/tmp/upstream/* . diff --git a/debian/extra/initramfs-tools/hooks/udev b/debian/extra/initramfs-tools/hooks/udev index 4da5b28..d45a287 100755 --- a/debian/extra/initramfs-tools/hooks/udev +++ b/debian/extra/initramfs-tools/hooks/udev @@ -16,6 +16,12 @@ esac mkdir -p "$DESTDIR/usr/lib/systemd" copy_exec /usr/lib/systemd/systemd-udevd /usr/lib/systemd copy_exec /usr/bin/udevadm /usr/bin +# libkmod is loaded via dlopen() since v256 so pull it in manually +for library in usr/lib/*/libkmod.so.*; do + if [ -f "${library}" ]; then + copy_exec "${library}" + fi +done mkdir -p "$DESTDIR/etc/udev" cp -p /etc/udev/udev.conf "$DESTDIR/etc/udev/" |