Drop patches merged upstream

diff --git a/debian/patches/series b/debian/patches/series
index 88275b836c0cadd12e320753d23a95fda3b109dc..e6d8fbcee2188aaad657c80eecae37a87be49e2a 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-udev-first-set-properties-based-on-usb-subsystem.patch
-tmpfiles.d-do-not-fail-if-provision.conf-fails.patch
 debian/Use-Debian-specific-config-files.patch
 debian/Bring-tmpfiles.d-tmp.conf-in-line-with-Debian-defaul.patch
 debian/Make-run-lock-tmpfs-an-API-fs.patch

diff --git a/debian/patches/tmpfiles.d-do-not-fail-if-provision.conf-fails.patch b/debian/patches/tmpfiles.d-do-not-fail-if-provision.conf-fails.patch
deleted file mode 100644 (file)
index d19f91b..0000000
--- a/debian/patches/tmpfiles.d-do-not-fail-if-provision.conf-fails.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Luca Boccassi <bluca@debian.org>
-Date: Thu, 3 Nov 2022 20:10:57 +0000
-Subject: [PATCH] tmpfiles.d: do not fail if provision.conf fails
-
-On a read-only filesystem creating /root/.ssh might fail, but that's ok.
-Do not fail the run, as this is only needed to add the credential, which
-is a separate step.
----
- tmpfiles.d/provision.conf | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tmpfiles.d/provision.conf b/tmpfiles.d/provision.conf
-index 3c56f42..093104a 100644
---- a/tmpfiles.d/provision.conf
-+++ b/tmpfiles.d/provision.conf
-@@ -17,6 +17,6 @@ f^ /etc/issue.d/50-provision.conf - - - - login.issue
- f^ /etc/hosts - - - - network.hosts
- 
- # Provision SSH key for root
--d /root :0700 root :root -
--d /root/.ssh :0700 root :root -
-+d- /root :0700 root :root -
-+d- /root/.ssh :0700 root :root -
- f^ /root/.ssh/authorized_keys :0600 root :root - ssh.authorized_keys.root

diff --git a/debian/patches/udev-first-set-properties-based-on-usb-subsystem.patch b/debian/patches/udev-first-set-properties-based-on-usb-subsystem.patch
deleted file mode 100644 (file)
index 7729fa6..0000000
--- a/debian/patches/udev-first-set-properties-based-on-usb-subsystem.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Yu Watanabe <watanabe.yu+github@gmail.com>
-Date: Thu, 3 Nov 2022 09:39:36 +0900
-Subject: [PATCH] udev: first set properties based on usb subsystem
-
-After 479da1107a0d4e2f7ef5cd938512b87a0e45f180, the usb_id builtin
-command does not set ID_SERIAL if ID_BUS is already set.
-Before the commit, all properties set based on pci bus were overwritten
-by the usb_id, hence now it is sufficient setting them only when ID_BUS is
-not set yet.
-
-Fixes #25238.
----
- rules.d/60-serial.rules | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/rules.d/60-serial.rules b/rules.d/60-serial.rules
-index f303e27..c133f26 100644
---- a/rules.d/60-serial.rules
-+++ b/rules.d/60-serial.rules
-@@ -3,9 +3,10 @@
- ACTION=="remove", GOTO="serial_end"
- SUBSYSTEM!="tty", GOTO="serial_end"
- 
--SUBSYSTEMS=="pci", ENV{ID_BUS}="pci", ENV{ID_VENDOR_ID}="$attr{vendor}", ENV{ID_MODEL_ID}="$attr{device}"
--SUBSYSTEMS=="pci", IMPORT{builtin}="hwdb --subsystem=pci"
- SUBSYSTEMS=="usb", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb"
-+SUBSYSTEMS=="pci", ENV{ID_BUS}=="", ENV{ID_BUS}="pci", \
-+  ENV{ID_VENDOR_ID}="$attr{vendor}", ENV{ID_MODEL_ID}="$attr{device}", \
-+  IMPORT{builtin}="hwdb --subsystem=pci"
- 
- # /dev/serial/by-path/, /dev/serial/by-id/ for USB devices
- KERNEL!="ttyUSB[0-9]*|ttyACM[0-9]*", GOTO="serial_end"