Re: [patch] Add cons25 terminfo file (used by kfreebsd-i386)
On 30/06/2009, Luca Favatella <slackydeb@gmail.com> wrote:
> On 30/06/2009, Colin Watson <cjwatson@debian.org> wrote:
>> On Tue, Jun 30, 2009 at 08:43:08PM +0200, Luca Favatella wrote:
>>> On 30/06/2009, Luca Favatella <slackydeb@gmail.com> wrote:
>>> > This little patch adds cons25 terminfo file.
> [...]
>> I think this is fine, but I suspect other people will object to the
>> (small) size increase. We should probably make di-utils-terminfo
>> architecture-specific and include this file conditionally, to avoid a
>> size increase on other architectures. Could you look into doing this?
>
> Ok, tomorrow I hope to look into doing this.
Done in the attached version 3 of the patch.
I built this on kfreebsd-i386.
The built packages are of the same size of those built from trunk (12
bytes more or less from a quick look)(obviously except
di-utils-terminfo that is a lot smaller).
In particular the di-utils-terminfo works in kfreebsd d-i (monolithic miniiso).
Please carefully review this patch (because of my lack of experience).
Cheers,
Luca Favatella
Index: packages/debian-installer-utils/debian/control
===================================================================
--- packages/debian-installer-utils/debian/control (.../trunk) (revision 59177)
+++ packages/debian-installer-utils/debian/control (.../branches/d-i/kfreebsd) (revision 59189)
@@ -41,6 +41,6 @@
XC-Package-Type: udeb
Package: di-utils-terminfo
-Architecture: all
+Architecture: any
Description: Terminfo entries needed by newt/slang in debian installer
XC-Package-Type: udeb
Index: packages/debian-installer-utils/debian/changelog
===================================================================
--- packages/debian-installer-utils/debian/changelog (.../trunk) (revision 59177)
+++ packages/debian-installer-utils/debian/changelog (.../branches/d-i/kfreebsd) (revision 59189)
@@ -1,3 +1,11 @@
+debian-installer-utils (1.70) UNRELEASED; urgency=low
+
+ [ Luca Favatella ]
+ * Add 'cons25' terminfo file (used by kfreebsd-i386).
+ * Make di-utils-terminfo Architecture: any to avoid size increase.
+
+ -- Colin Watson <cjwatson@debian.org> Tue, 30 Jun 2009 13:02:50 +0100
+
debian-installer-utils (1.69) unstable; urgency=low
* block-attr: The 'type' builtin doesn't seem to handle variable
Index: packages/debian-installer-utils/debian/rules
===================================================================
--- packages/debian-installer-utils/debian/rules (.../trunk) (revision 59177)
+++ packages/debian-installer-utils/debian/rules (.../branches/d-i/kfreebsd) (revision 59189)
@@ -1,5 +1,12 @@
#!/usr/bin/make -f
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+ TERMS=/usr/share/terminfo/a/ansi /usr/share/terminfo/d/dumb \
+ /usr/share/terminfo/l/linux /usr/share/terminfo/v/vt102
+else ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
+ TERMS=/usr/share/terminfo/c/cons25
+endif
+
build: build-stamp
build-stamp:
dh_testdir
@@ -25,12 +32,6 @@
dh_installdebconf -i
dh_compress -i
dh_fixperms -i
- for file in /usr/share/terminfo/a/ansi /usr/share/terminfo/d/dumb \
- /usr/share/terminfo/l/linux /usr/share/terminfo/v/vt102; do \
- mkdir -p debian/di-utils-terminfo/`dirname $$file`; \
- cp -pL $$file debian/di-utils-terminfo/$$file; \
- chmod 644 debian/di-utils-terminfo/$$file; \
- done
dh_installdeb -i
dh_gencontrol -i
dh_builddeb -i
@@ -51,6 +52,11 @@
dh_installdebconf -a
dh_compress -a
dh_fixperms -a
+ for file in $(TERMS); do \
+ mkdir -p debian/di-utils-terminfo/`dirname $$file`; \
+ cp -pL $$file debian/di-utils-terminfo/$$file; \
+ chmod 644 debian/di-utils-terminfo/$$file; \
+ done
dh_strip -a
dh_installdeb -a
dh_shlibdeps -a
Reply to: