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

Re: Bug#814027: "ts209" d-i image failed to build due to size



Hi Daniel,

I had an idea on how to solve this problem: in addition to building
gpgv-udeb from gnupg2, you could build a gpgv1.4-udeb on armel.  I
could then use that gpgv1.4-udeb on the armel subarch with the size
issues.

Would that work for you?  I've attached a proposed patch.

-- 
Martin Michlmayr
http://www.cyrius.com/
diff --git a/debian/control b/debian/control
index 39ce3d2..d3860ed 100644
--- a/debian/control
+++ b/debian/control
@@ -70,6 +70,22 @@ Description: GNU privacy guard - signature verification tool
  different (and simpler) way to check that the public keys used to
  make the signature are trustworthy.
 
+Package: gpgv1.4-udeb
+Package-Type: udeb
+Section: debian-installer
+Priority: extra
+Architecture: armel
+Provides: gpgv-udeb
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: minimal signature verification tool
+ GnuPG is GNU's tool for secure communication and data storage.
+ It can be used to encrypt data and to create digital signatures.
+ It includes an advanced key management facility and is compliant
+ with the proposed OpenPGP Internet standard as described in RFC 4880.
+ .
+ This is GnuPG's signature verification tool, gpgv, packaged in minimal
+ form for use in debian-installer.
+
 Package: gpgv-win32
 Architecture: all
 Priority: extra
diff --git a/debian/gpgv1.4-udeb.install b/debian/gpgv1.4-udeb.install
new file mode 100644
index 0000000..dc83591
--- /dev/null
+++ b/debian/gpgv1.4-udeb.install
@@ -0,0 +1 @@
+build-udeb/g10/gpgv usr/bin/
diff --git a/debian/rules b/debian/rules
index e51d3f0..29c2516 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,6 +50,11 @@ build-deb-curl/config.status:
 	(mkdir -p $(@D); cd $(@D); \
 	    ../configure LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS_DEF)" CFLAGS="$(CFLAGS_DEF)" $(CONFARGS) $(CONFARGS_FULL) $(HOSTARG))
 
+build-udeb/config.status:
+	dh_testdir
+	(mkdir -p $(@D); cd $(@D); CFLAGS="-g -Os" \
+	    ../configure $(CONFARGS) $(CONFARGS_MINIMAL) $(HOSTARG) )
+
 build-win32/config.status:
 	dh_testdir
 	(mkdir -p $(@D); cd $(@D); CFLAGS="-g -Os" \
@@ -74,13 +79,21 @@ ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 endif
 	touch $@
 
+build-udeb-stamp: build-udeb/config.status
+	dh_testdir
+	$(MAKE) -C build-udeb/
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	make -C build-udeb/checks check || exit 1
+endif
+	touch $@
+
 build-win32-stamp: build-win32/config.status
 	dh_testdir
 	$(MAKE) -C build-win32/
 	touch $@
 
 build: build-arch
-build-arch: build-deb-stamp build-deb-curl-stamp
+build-arch: build-deb-stamp build-deb-curl-stamp build-udeb-stamp
 build-indep: build-win32-stamp
 
 ##################################### clean ##################################
@@ -88,9 +101,9 @@ build-indep: build-win32-stamp
 clean: 
 	dh_testdir
 	dh_testroot
-	rm -rf build-deb-curl/ build-deb/ build-win32/
+	rm -rf build-udeb/ build-deb-curl/ build-deb/ build-win32/
 	# find . -name \*~ | xargs rm -vf
-	dh_clean build-deb-stamp build-deb-curl-stamp build-win32-stamp
+	dh_clean build-deb-stamp build-deb-curl-stamp build-udeb-stamp build-win32-stamp
 
 #################################### install #################################
 

Reply to: