[Pkg-loop-aes-commits] r1432 - in /trunk/loop-aes-utils: ./ debian/changelog debian/control debian/rules
xam at users.alioth.debian.org
xam at users.alioth.debian.org
Sat Aug 11 16:35:28 UTC 2007
Author: xam
Date: Sat Aug 11 16:35:28 2007
New Revision: 1432
URL: http://svn.debian.org/wsvn/pkg-loop-aes/?sc=1&rev=1432
Log:
* Two passes for deb and udeb, building the udeb
without selinux/libvolume-id.
Modified:
trunk/loop-aes-utils/ (props changed)
trunk/loop-aes-utils/debian/changelog
trunk/loop-aes-utils/debian/control
trunk/loop-aes-utils/debian/rules
Propchange: trunk/loop-aes-utils/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sat Aug 11 16:35:28 2007
@@ -1,4 +1,4 @@
-02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes-utils:11012
+02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes-utils:11013
53348a03-e5de-0310-b097-96e6f85ea926:/import/loop-aes-utils/branches/2.12-alternative:120
53348a03-e5de-0310-b097-96e6f85ea926:/import/loop-aes-utils/branches/2.12-dpatch:196
53348a03-e5de-0310-b097-96e6f85ea926:/import/loop-aes-utils/trunk/current:338
Modified: trunk/loop-aes-utils/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/changelog?rev=1432&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/changelog (original)
+++ trunk/loop-aes-utils/debian/changelog Sat Aug 11 16:35:28 2007
@@ -6,6 +6,8 @@
* Build with libvolume-id, libselinux
* Update loop-AES patch to v3.2a and rebase against
util-linux-ng 2.13-rc3 (Closes: #436909)
+ * Two passes for deb and udeb, building the udeb
+ without selinux/libvolume-id.
-- Max Vozeler <xam at debian.org> Sat, 11 Aug 2007 15:24:42 +0200
Modified: trunk/loop-aes-utils/debian/control
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/control?rev=1432&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/control (original)
+++ trunk/loop-aes-utils/debian/control Sat Aug 11 16:35:28 2007
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Loop-AES Team <pkg-loop-aes-maint at lists.alioth.debian.org>
Uploaders: Max Vozeler <xam at debian.org>
-Build-Depends: debhelper (>= 4.2), dpatch (>= 2.0.0), gettext, libvolume-id-dev (>=0.113-2), uuid-dev, libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
+Build-Depends: debhelper (>= 4.2), dpatch (>= 2.0.0), gettext, libvolume-id-dev (>=0.113-2), libblkid-dev, uuid-dev, libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
Standards-Version: 3.7.2
Package: loop-aes-utils
Modified: trunk/loop-aes-utils/debian/rules
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/rules?rev=1432&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/rules (original)
+++ trunk/loop-aes-utils/debian/rules Sat Aug 11 16:35:28 2007
@@ -1,41 +1,62 @@
#!/usr/bin/make -f
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-CONFOPTS = --with-fsprobe=volume_id
+debbuild = debian/build-deb
+udebbuild = debian/build-udeb
+
+CFLAGS = -Wall -g
+
+confopts = --with-fsprobe=volume_id
ifeq ($(DEB_HOST_ARCH_OS),linux)
-CONFOPTS += --with-selinux
+ confopts += --with-selinux
endif
-config-stamp: patch-stamp configure
+confopts_udeb = --with-fsprobe=blkid
+
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+ confbuild += --build $(DEB_HOST_GNU_TYPE)
+else
+ confbuild += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
+build: build-deb build-udeb
+
+$(debbuild)/config.status: patch-stamp
+ mkdir -p $(debbuild)
+ cd $(debbuild) && \
+ CFLAGS="$(CFLAGS) -O2" \
+ ../../configure $(confbuild) $(confopts)
+
+build-deb: build-deb-stamp
+build-deb-stamp: $(debbuild)/config.status
dh_testdir
- ./configure $(CONFOPTS)
- touch config-stamp
+ $(MAKE) -C $(debbuild)
+ touch $@
-build: build-stamp
-build-stamp: config-stamp
+$(udebbuild)/config.status: patch-stamp
+ mkdir -p $(udebbuild)
+ cd $(udebbuild) && \
+ CFLAGS="$(CFLAGS) -Os" \
+ ../../configure $(confbuild) $(confopts_udeb)
+
+build-udeb: build-udeb-stamp
+build-udeb-stamp: $(udebbuild)/config.status
dh_testdir
- $(MAKE)
- touch build-stamp
+ $(MAKE) -C $(udebbuild)
+ touch $@
clean: clean1 unpatch
clean1:
dh_testdir
dh_testroot
- rm -f build-stamp config-stamp
- [ ! -f Makefile ] || $(MAKE) clean
+ rm -f *-stamp
+ rm -rf $(debbuild) $(udebbuild)
+ [ ! -f Makefile ] || $(MAKE) distclean
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
endif
@@ -53,10 +74,10 @@
dh_clean -k
dh_installdirs
- install -m 4755 -o root mount/mount $(DIR)/bin
- install -m 4755 -o root mount/umount $(DIR)/bin
- install -m 755 mount/losetup $(DIR)/sbin
- install -m 755 mount/swapon $(DIR)/sbin
+ install -m 4755 -o root $(debbuild)/mount/mount $(DIR)/bin
+ install -m 4755 -o root $(debbuild)/mount/umount $(DIR)/bin
+ install -m 755 $(debbuild)/mount/losetup $(DIR)/sbin
+ install -m 755 $(debbuild)/mount/swapon $(DIR)/sbin
install -m 755 debian/loop-aes-keygen $(DIR)/usr/bin
# lintian-override
@@ -65,11 +86,12 @@
# udeb
install -d $(DIR_UDEB)/bin
install -d $(DIR_UDEB)/sbin
- install -m 755 mount/mount $(DIR_UDEB)/bin/mount-aes
- install -m 755 mount/umount $(DIR_UDEB)/bin/umount-aes
- install -m 755 mount/losetup $(DIR_UDEB)/sbin/losetup-aes
- install -m 755 mount/swapon $(DIR_UDEB)/sbin/swapon-aes
+ install -m 755 $(udebbuild)/mount/mount $(DIR_UDEB)/bin/mount-aes
+ install -m 755 $(udebbuild)/mount/umount $(DIR_UDEB)/bin/umount-aes
+ install -m 755 $(udebbuild)/mount/losetup $(DIR_UDEB)/sbin/losetup-aes
+ install -m 755 $(udebbuild)/mount/swapon $(DIR_UDEB)/sbin/swapon-aes
install -m 755 debian/loop-aes-keygen $(DIR_UDEB)/bin
+
# initramsfs-tools integration
install -m 755 debian/initramfs/script $(DIR)/usr/share/initramfs-tools/scripts/local-top/loopaes
install -m 755 debian/initramfs/hook $(DIR)/usr/share/initramfs-tools/hooks/loopaes
More information about the Pkg-loop-aes-commits
mailing list