[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

cdebconf-slang-udeb for use in cdrom 2.88 MiB floppy?



I suggest making an extra cdebconf udeb for use in the cdrom d-i
floppy.  It should have the slang frontend enabled by default.  Here
is a patch to enable it.  The only thing missing in the patch is
copying the control files:

  cd debian
  cp cdebconf-udeb.dirs cdebconf-slang-udeb.dirs
  cp cdebconf-udeb.postinst cdebconf-slang-udeb.postinst
  cp cdebconf-udeb.templates cdebconf-slang-udeb.templates

Do you think this is a good idea?

The slang frontend do not currently work when building floppies, but
when mklibs is fixed (#178002), it should be ok.

Index: debian/changelog
===================================================================
RCS file: /cvs/debian-boot/debian-installer/tools/cdebconf/debian/changelog,v
retrieving revision 1.83
diff -u -3 -p -u -r1.83 changelog
--- debian/changelog	24 Jan 2003 20:45:22 -0000	1.83
+++ debian/changelog	24 Jan 2003 20:52:49 -0000
@@ -28,6 +28,8 @@ cdebconf (0.30) UNRELEASED; urgency=low
   * Petter Reinholdtsen
     - Add configure option --with-default-frontend to make it easier to
       change frontend at compile time.
+    - Made new package cdebconf-slang-udeb where the slang frontend is
+      used instead of the text frontend.
 
  -- Randolph Chung <tausq@debian.org>  Sun,  8 Dec 2002 11:02:59 -0800
 
Index: debian/control
===================================================================
RCS file: /cvs/debian-boot/debian-installer/tools/cdebconf/debian/control,v
retrieving revision 1.21
diff -u -3 -p -u -r1.21 control
--- debian/control	23 Nov 2002 23:24:03 -0000	1.21
+++ debian/control	24 Jan 2003 20:52:49 -0000
@@ -49,6 +49,20 @@ Description: Debian Configuration Manage
  cdebconf-udeb is a minimal cdebconf package used by the 
  debian-installer
 
+Package: cdebconf-slang-udeb
+Architecture: any
+Section: debian-installer
+Priority: standard
+Provides: libdebconf1
+Description: Debian Configuration Management System (C-implementation)
+ Debconf is a configuration management system for Debian packages. It is
+ used by some packages to prompt you for information before they are
+ installed. This is a reimplementation of the original debconf version
+ in C.
+ .
+ cdebconf-slang-udeb is a minimal cdebconf package used by the 
+ debian-installer
+
 Package: libdebconf1
 Architecture: any
 Section: libs
Index: debian/rules
===================================================================
RCS file: /cvs/debian-boot/debian-installer/tools/cdebconf/debian/rules,v
retrieving revision 1.26
diff -u -3 -p -u -r1.26 rules
--- debian/rules	4 Dec 2002 23:34:25 -0000	1.26
+++ debian/rules	24 Jan 2003 20:52:49 -0000
@@ -10,13 +10,18 @@ export DH_COMPAT=2
 
 topdir=$(shell pwd)
 udebbuild=$(topdir)/debian/build-udeb
+slang_udebbuild=$(topdir)/debian/build-slang-udeb
 debbuild=$(topdir)/debian/build
 
-PACKAGE=cdebconf-udeb
 VERSION=$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
 DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
-FILENAME=$(PACKAGE)_$(VERSION)_$(DEB_HOST_ARCH).udeb
-PRIORITY=$(shell grep '^Package: cdebconf-udeb' debian/control -A 10 | grep ^Priority: | cut -d ' ' -f 2)
+
+text_udebname=cdebconf-udeb_$(VERSION)_$(DEB_HOST_ARCH).udeb
+text_udebpriority=$(shell grep '^Package: cdebconf-udeb' debian/control -A 10 | grep ^Priority: | cut -d ' ' -f 2)
+
+slang_udebname=cdebconf-slang-udeb_$(VERSION)_$(DEB_HOST_ARCH).udeb
+slang_udebpriority=$(shell grep '^Package: cdebconf-slang-udeb' debian/control -A 10 | grep ^Priority: | cut -d ' ' -f 2)
+
 CONFFILE=/etc/cdebconf.conf
 
 #package names
@@ -44,6 +49,7 @@ clean:
 	rm -f *-stamp
 	-$(MAKE) distclean
 	-rm -rf $(udebbuild)
+	-rm -rf $(slang_udebbuild)
 	-rm -rf $(debbuild)
 	dh_clean
 
@@ -54,11 +60,25 @@ build-udeb-stamp:
 	(cd $(udebbuild); CFLAGS="$(CFLAGS) $(SIZEOPTFLAG) -fomit-frame-pointer" \
 		$(topdir)/configure --prefix=/usr --sysconfdir=/etc \
 		--without-rpath --with-db="rfc822db" \
-		--with-frontend="text" $(DEBUG_CONFIGURE_OPT) \
+		--with-frontend="text" --with-default-frontend="text" \
+		$(DEBUG_CONFIGURE_OPT) \
 		--with-conffile=$(CONFFILE))
 	(cd $(udebbuild); $(MAKE) clean; $(MAKE))
 	touch $@
 
+build-slang-udeb: build-slang-udeb-stamp
+build-slang-udeb-stamp:
+	dh_testdir
+	[ -d $(slang_udebbuild) ] || mkdir -p $(slang_udebbuild)
+	(cd $(slang_udebbuild); CFLAGS="$(CFLAGS) $(SIZEOPTFLAG) -fomit-frame-pointer" \
+		$(topdir)/configure --prefix=/usr --sysconfdir=/etc \
+		--without-rpath --with-db="rfc822db" \
+		--with-frontend="slang" --with-default-frontend="slang" \
+		$(DEBUG_CONFIGURE_OPT) \
+		--with-conffile=$(CONFFILE))
+	(cd $(slang_udebbuild); $(MAKE) clean; $(MAKE))
+	touch $@
+
 build: build-stamp
 build-stamp:
 	dh_testdir
@@ -85,6 +105,19 @@ install-udeb: build-udeb
 	rm -rf $(shell pwd)/debian/cdebconf-udeb/usr/share/man
 	rm -rf $(shell pwd)/debian/cdebconf-udeb/usr/lib/lib*.a
 
+install-slang-udeb: build-slang-udeb
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	dh_installdebconf -n -pcdebconf-slang-udeb
+	(cd $(slang_udebbuild); \
+		$(MAKE) install prefix=$(shell pwd)/debian/cdebconf-slang-udeb/usr \
+		etcdir=$(shell pwd)/debian/cdebconf-slang-udeb/etc )
+	rm -rf $(shell pwd)/debian/cdebconf-slang-udeb/usr/include
+	rm -rf $(shell pwd)/debian/cdebconf-slang-udeb/usr/share/man
+	rm -rf $(shell pwd)/debian/cdebconf-slang-udeb/usr/lib/lib*.a
+
 install: build
 	dh_testdir
 	dh_testroot
@@ -108,7 +141,7 @@ binary-indep: build install
 # Build architecture-dependent files here.
 #
 # Note that this builds a .udeb, which is not policy compliant or anything.
-binary-arch: cdebconf cdebconf-udeb
+binary-arch: cdebconf cdebconf-udeb cdebconf-slang-udeb
 
 $(LIBDEBCONF): install
 	dh_testdir
@@ -176,10 +209,28 @@ cdebconf-udeb: install-udeb
 	# Don't write your stupid guesses to debian/files.
 	dh_gencontrol 		-p$@ -- -fdebian/files~
 	# Register file manually.
-	dpkg-distaddfile	$(FILENAME) debian-installer $(PRIORITY)
+	dpkg-distaddfile	$(text_udebname) debian-installer $(text_udebpriority)
+# udebs shouldn't have md5sums.
+#	dh_md5sums		-p$@
+	dh_builddeb		-p$@ --filename=$(text_udebname)
+
+cdebconf-slang-udeb: install-slang-udeb
+	@echo "Building $@"
+	dh_testdir
+	dh_testroot
+	dh_installdirs
+	dh_strip		-p$@
+	dh_compress		-p$@
+	dh_fixperms		-p$@
+	dh_installdeb		-p$@
+	dh_shlibdeps -p$@ -ldebian/$@/usr/lib
+	# Don't write your stupid guesses to debian/files.
+	dh_gencontrol 		-p$@ -- -fdebian/files~
+	# Register file manually.
+	dpkg-distaddfile	$(slang_udebname) debian-installer $(slang_udebpriority)
 # udebs shouldn't have md5sums.
 #	dh_md5sums		-p$@
-	dh_builddeb		-p$@ --filename=$(FILENAME)
+	dh_builddeb		-p$@ --filename=$(slang_udebname)
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install



Reply to: