Hi,
* Holger Wansing <hwans...@mailbox.org> [220802 23:37]:
> Cyril Brulebois <k...@debian.org> wrote (Sun, 31 Jul 2022 14:31:20 +0200):
> > > I was digging around in the d-i code, and it appears for dmraid to
> > > be invoked, one has to boot with disk-detect/dmraid/enable.
> > >
> > > I have opened merge requests to remove the dmraid/sataraid code from
> > > d-i. The changes look like low risk to me, but obviously I have no
> > > idea. For the lack of a build environment I also didn't test them.
> > >
> > > Given d-i does nothing with dmraid unless the boot flag is present,
> > > I want to ask if dmraid could also stop shipping its udeb, if thats
> > > ok with debian-boot?
> >
> > Given how specific it is, opt-in, on a specific arch, and dead upstream,
> > looks like a wholesale removal would be the best way forward, yes.
>
> I have merged the merge requests filed by Chris (partman-base, partman-auto,
> hw-detect, grub-installer).
>
> The packages build fine with those changings.
> And a locally built mini.iso with those changings in local udebs also
> installs fine (default install) in QEMU VM.
Great, thanks for testing!
Maybe these changes can make it into unstable soon?
I'm attaching a draft patch to drop udebs from src:dmraid. Maybe you
want to use this as a starting point, László?
I would also suggest keeping dmraid for one more release, and
putting something into the release notes. To keep dmraid, I think
the severity of this bug also might need adjusting, or something.
Thanks everyone for your helping hands.
Best,
Chris
diff -Nru dmraid-1.0.0.rc16/debian/changelog dmraid-1.0.0.rc16/debian/changelog
--- dmraid-1.0.0.rc16/debian/changelog 2022-02-16 16:44:50.000000000 +0000
+++ dmraid-1.0.0.rc16/debian/changelog 2022-08-02 23:30:56.000000000 +0000
@@ -1,3 +1,10 @@
+dmraid (1.0.0.rc16-11.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Drop udebs.
+
+ -- Chris Hofstaedtler <z...@debian.org> Tue, 02 Aug 2022 23:30:56 +0000
+
dmraid (1.0.0.rc16-11) unstable; urgency=medium
[ Helmut Grohne <hel...@subdivi.de> ]
diff -Nru dmraid-1.0.0.rc16/debian/control dmraid-1.0.0.rc16/debian/control
--- dmraid-1.0.0.rc16/debian/control 2022-02-16 16:44:50.000000000 +0000
+++ dmraid-1.0.0.rc16/debian/control 2022-08-02 23:30:56.000000000 +0000
@@ -28,28 +28,6 @@
Please read the documentation in /usr/share/doc/dmraid BEFORE attempting
any use of this software. Improper use can cause data loss!
-Package: dmraid-udeb
-Architecture: linux-any
-Section: debian-installer
-Package-Type: udeb
-Depends: ${shlibs:Depends}, dmsetup-udeb
-Description: Device-Mapper Software RAID support tool (udeb)
- dmraid discovers, activates, deactivates and displays properties
- of software RAID sets (eg, ATARAID) and contained DOS partitions.
- .
- This is the minimal package (udeb) used by debian-installer
-
-Package: libdmraid1.0.0.rc16-udeb
-Architecture: linux-any
-Section: debian-installer
-Package-Type: udeb
-Depends: ${shlibs:Depends}
-Description: Device-Mapper Software RAID support tool - shared library (udeb)
- dmraid discovers, activates, deactivates and displays properties
- of software RAID sets (eg, ATARAID) and contained DOS partitions.
- .
- This is the minimal package (udeb shared library) used by debian-installer
-
Package: libdmraid1.0.0.rc16
Architecture: linux-any
Multi-Arch: same
diff -Nru dmraid-1.0.0.rc16/debian/dmraid.install
dmraid-1.0.0.rc16/debian/dmraid.install
--- dmraid-1.0.0.rc16/debian/dmraid.install 2017-08-30 21:28:37.000000000
+0000
+++ dmraid-1.0.0.rc16/debian/dmraid.install 2022-08-02 23:30:56.000000000
+0000
@@ -1,5 +1,5 @@
debian/initramfs/dmraid.initramfs-hook/dmraid usr/share/initramfs-tools/hooks
debian/initramfs/dmraid.initramfs-local-top/dmraid
usr/share/initramfs-tools/scripts/local-top
-debian/standard/sbin/dmraid sbin
-debian/standard/usr/share/man usr/share
+debian/tmp/sbin/dmraid sbin
+debian/tmp/usr/share/man usr/share
debian/dmraid-activate sbin
diff -Nru dmraid-1.0.0.rc16/debian/dmraid-udeb.install
dmraid-1.0.0.rc16/debian/dmraid-udeb.install
--- dmraid-1.0.0.rc16/debian/dmraid-udeb.install 2017-08-30
21:28:37.000000000 +0000
+++ dmraid-1.0.0.rc16/debian/dmraid-udeb.install 1970-01-01
00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-debian/udeb/sbin/dmraid sbin
-debian/dmraid-activate sbin
diff -Nru dmraid-1.0.0.rc16/debian/libdmraid1.0.0.rc16.install
dmraid-1.0.0.rc16/debian/libdmraid1.0.0.rc16.install
--- dmraid-1.0.0.rc16/debian/libdmraid1.0.0.rc16.install 2022-02-03
16:28:13.000000000 +0000
+++ dmraid-1.0.0.rc16/debian/libdmraid1.0.0.rc16.install 2022-08-02
23:30:56.000000000 +0000
@@ -1,2 +1,2 @@
#!/usr/bin/dh-exec
-debian/standard/lib/${DEB_HOST_MULTIARCH}/*.so.* lib/${DEB_HOST_MULTIARCH}
+debian/tmp/lib/${DEB_HOST_MULTIARCH}/*.so.* lib/${DEB_HOST_MULTIARCH}
diff -Nru dmraid-1.0.0.rc16/debian/libdmraid1.0.0.rc16-udeb.install
dmraid-1.0.0.rc16/debian/libdmraid1.0.0.rc16-udeb.install
--- dmraid-1.0.0.rc16/debian/libdmraid1.0.0.rc16-udeb.install 2022-02-03
16:28:13.000000000 +0000
+++ dmraid-1.0.0.rc16/debian/libdmraid1.0.0.rc16-udeb.install 1970-01-01
00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-#!/usr/bin/dh-exec
-debian/udeb/lib/${DEB_HOST_MULTIARCH}/*.so.* lib/${DEB_HOST_MULTIARCH}
diff -Nru dmraid-1.0.0.rc16/debian/libdmraid-dev.install
dmraid-1.0.0.rc16/debian/libdmraid-dev.install
--- dmraid-1.0.0.rc16/debian/libdmraid-dev.install 2022-02-03
16:28:13.000000000 +0000
+++ dmraid-1.0.0.rc16/debian/libdmraid-dev.install 2022-08-02
23:30:56.000000000 +0000
@@ -1,3 +1,3 @@
#!/usr/bin/dh-exec
-debian/standard/lib/${DEB_HOST_MULTIARCH}/*.a usr/lib/${DEB_HOST_MULTIARCH}
-debian/standard/usr/include/dmraid usr/include
+debian/tmp/lib/${DEB_HOST_MULTIARCH}/*.a usr/lib/${DEB_HOST_MULTIARCH}
+debian/tmp/usr/include/dmraid usr/include
diff -Nru dmraid-1.0.0.rc16/debian/rules dmraid-1.0.0.rc16/debian/rules
--- dmraid-1.0.0.rc16/debian/rules 2022-02-16 16:44:50.000000000 +0000
+++ dmraid-1.0.0.rc16/debian/rules 2022-08-02 23:30:56.000000000 +0000
@@ -17,37 +17,21 @@
endif
version := $(shell dpkg-parsechangelog | sed -ne 's/^Version:
\(.*\)-[^-]*$$/\1/p')
-buildroot := $(CURDIR)/debian/build
-flavours := standard udeb
common-config-flags := $(CROSS) --prefix=/usr --exec-prefix=/
'--libdir=$${exec_prefix}/lib/$(DEB_HOST_MULTIARCH)'
methods: methods-stamp
methods-stamp:
dh_testdir
- mkdir -p ${buildroot}
cp -f /usr/share/misc/config.sub 1.0.0.rc16/autoconf/config.sub
cp -f /usr/share/misc/config.guess 1.0.0.rc16/autoconf/config.guess
- for i in ${flavours}; do cp -rp ${version} ${buildroot}/$$i; done
- touch $@
-
-configure-standard: methods configure-standard-stamp
-configure-standard-stamp:
- dh_testdir
- cd ${buildroot}/standard && \
- ./configure ${common-config-flags} --disable-klibc --enable-libselinux
--enable-libsepol --enable-shared_lib --enable-led --enable-intel_led
- touch $@
-
-configure-udeb: methods configure-udeb-stamp
-configure-udeb-stamp:
- dh_testdir
- cd ${buildroot}/udeb && \
- ./configure ${common-config-flags} --disable-libselinux
--disable-libsepol --enable-shared_lib
touch $@
configure: methods configure-stamp
-configure-stamp: $(addprefix configure-, $(flavours))
+configure-stamp:
dh_testdir
+ cd ${version} && \
+ ./configure ${common-config-flags} --disable-klibc --enable-libselinux
--enable-libsepol --enable-shared_lib --enable-led --enable-intel_led
touch $@
build-arch: build
@@ -56,16 +40,14 @@
build: $(QUILT_STAMPFN) configure build-stamp
build-stamp:
dh_testdir
- for i in ${flavours}; do cd ${buildroot}/$$i && make; done
+ cd ${version} && make
touch $@
install: build
dh_testdir
dh_testroot
dh_prep
- cd ${buildroot}/standard && make DESTDIR=$(CURDIR)/debian/standard
install
- cd ${buildroot}/udeb && make DESTDIR=$(CURDIR)/debian/udeb install
- rm -rf debian/udeb/usr
+ cd ${version} && make DESTDIR=$(CURDIR)/debian/tmp install
dh_link
binary-arch: install
@@ -83,7 +65,7 @@
dh_strip -a
dh_compress -a
dh_fixperms -a
- dh_makeshlibs -a --add-udeb 'libdmraid1.0.0.rc16-udeb' -V
+ dh_makeshlibs -a -V
dh_shlibdeps -a
dh_installdeb -a
dh_gencontrol -a
@@ -100,8 +82,7 @@
dh_testroot
dh_clean
$(RM) *-stamp
- $(RM) -r debian/build debian/standard debian/udeb
$(RM) 1.0.0.rc16/autoconf/config.guess
$(RM) 1.0.0.rc16/autoconf/config.sub
-.PHONY: clean binary binary-indep binary-arch install build configure methods
$(addprefix configure-, $(flavours))
+.PHONY: clean binary binary-indep binary-arch install build configure methods
