[Pkg-loop-aes-commits] r1399 - in /trunk/loop-aes: ./ debian/changelog debian/loop-aes-runtests debian/rules.real debian/source/rules
xam at users.alioth.debian.org
xam at users.alioth.debian.org
Thu May 17 18:29:04 UTC 2007
Author: xam
Date: Thu May 17 18:29:04 2007
New Revision: 1399
URL: http://svn.debian.org/wsvn/pkg-loop-aes/?sc=1&rev=1399
Log:
* Remove README.ciphers, changelog.ciphers
* Use upstream Makefile in debian/rules.real
* Adapt debian/rules.real, debian/source/rules for changed paths
Modified:
trunk/loop-aes/ (props changed)
trunk/loop-aes/debian/changelog
trunk/loop-aes/debian/loop-aes-runtests
trunk/loop-aes/debian/rules.real
trunk/loop-aes/debian/source/rules
Propchange: trunk/loop-aes/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu May 17 18:29:04 2007
@@ -1,4 +1,4 @@
-02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes:10227
+02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes:10228
21abe0f1-f0ee-4de9-8a33-02d62b012b6b:/local/pkg-loop-aes/trunk/loop-aes:9932
21abe0f1-f0ee-4de9-8a33-02d62b012b6b:/local/temp:9926
53348a03-e5de-0310-b097-96e6f85ea926:/loop-aes/trunk:1255
Modified: trunk/loop-aes/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes/debian/changelog?rev=1399&op=diff
==============================================================================
--- trunk/loop-aes/debian/changelog (original)
+++ trunk/loop-aes/debian/changelog Thu May 17 18:29:04 2007
@@ -3,6 +3,9 @@
* New upstream release
* Finally use unchanged upstream tarball :-)
* Remove obsolete script debian/get-orig-source
+ * Remove README.ciphers, changelog.ciphers
+ * Use upstream Makefile in debian/rules.real
+ * Adapt debian/rules.real, debian/source/rules for changed paths
-- Max Vozeler <xam at debian.org> Thu, 17 May 2007 20:11:54 +0200
Modified: trunk/loop-aes/debian/loop-aes-runtests
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes/debian/loop-aes-runtests?rev=1399&op=diff
==============================================================================
--- trunk/loop-aes/debian/loop-aes-runtests (original)
+++ trunk/loop-aes/debian/loop-aes-runtests Thu May 17 18:29:04 2007
@@ -32,11 +32,8 @@
cd $tmpdir
cp /usr/share/loop-aes-testsuite/*.asc .
- cp /usr/share/loop-aes-testsuite/loop-AES.mk Makefile
- make tests
-
- cp /usr/share/loop-aes-testsuite/ciphers.mk Makefile
- make tests
+ cp /usr/share/loop-aes-testsuite/Makefile .
+ make tests EXTRA_CIPHERS=y
rm -rf $tmpdir
}
Modified: trunk/loop-aes/debian/rules.real
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes/debian/rules.real?rev=1399&op=diff
==============================================================================
--- trunk/loop-aes/debian/rules.real (original)
+++ trunk/loop-aes/debian/rules.real Thu May 17 18:29:04 2007
@@ -6,7 +6,7 @@
PACKAGE_SOURCE = $(PACKAGE)-source
PACKAGE_TESTSUITE = $(PACKAGE)-testsuite
-LOOP_AES_OPTIONS := CONFIG_BLK_DEV_LOOP_KEYSCRUB=y CONFIG_BLK_DEV_LOOP_PADLOCK=y
+LOOP_AES_OPTIONS := KEYSCRUB=y PADLOCK=y EXTRA_CIPHERS=y
BUILD_STAMP = $(STAMPS_DIR)/build_$(ARCH)_$(SUBARCH)_$(FLAVOUR)
SETUP_STAMP = $(STAMPS_DIR)/setup_$(ARCH)_$(SUBARCH)_$(FLAVOUR)
@@ -14,23 +14,17 @@
build-module-source-pkg: PACKAGE = loop-aes-source
build-module-source-pkg: PACKAGE_DIR = debian/$(PACKAGE)
build-module-source-pkg: MODULES_DIR = $(PACKAGE_DIR)/usr/src/modules
-build-module-source-pkg: DOC_DIR = $(PACKAGE_DIR)/usr/share/doc/$(PACKAGE)
build-module-source-pkg:
dh_testdir
dh_testroot
dh_clean -p$(PACKAGE)
dh_installdirs -p$(PACKAGE)
- dh_installchangelogs -p$(PACKAGE)
- dh_installdocs -p$(PACKAGE) debian/README.Debian
+ dh_installchangelogs -p$(PACKAGE) ChangeLog
+ dh_installdocs -p$(PACKAGE) README debian/README.Debian
- dh_install -p$(PACKAGE) loop-AES ciphers usr/src/modules/loop-aes
+ dh_install -p$(PACKAGE) $(filter-out debian,$(wildcard *)) usr/src/modules/loop-aes
dh_install -p$(PACKAGE) debian/copyright debian/changelog debian/compat debian/README.Debian $(wildcard debian/source/*) usr/src/modules/loop-aes/debian
cp debian/templates/control.source.in $(MODULES_DIR)/loop-aes/debian/control
-
- cp loop-AES/README $(DOC_DIR)/README
- cp loop-AES/ChangeLog $(DOC_DIR)/changelog
- cp ciphers/README $(DOC_DIR)/README.ciphers
- cp ciphers/ChangeLog $(DOC_DIR)/changelog.ciphers
dh_fixperms -p$(PACKAGE)
chmod +x $(MODULES_DIR)/loop-aes/debian/rules
@@ -50,9 +44,8 @@
dh_installman -p$(PACKAGE) debian/loop-aes-runtests.8
mkdir -p $(TESTSUITE_DIR)
- cp loop-AES/gpgkey*.asc $(TESTSUITE_DIR)
- cp loop-AES/Makefile $(TESTSUITE_DIR)/loop-AES.mk
- cp ciphers/Makefile $(TESTSUITE_DIR)/ciphers.mk
+ cp gpgkey*.asc $(TESTSUITE_DIR)
+ cp Makefile $(TESTSUITE_DIR)
install -m 0755 -D debian/loop-aes-runtests $(PACKAGE_DIR)/usr/sbin/loop-aes-runtests
binary-indep: build-module-source-pkg build-testsuite-pkg
@@ -69,33 +62,25 @@
$(SETUP_STAMP):
@rm -rf $(DIR)
mkdir -p $(DIR)
- cp -l loop-AES/*.[chS] $(DIR)
- cp -l loop-AES/loop.c-2.6.patched $(DIR)/patched-loop.c
- cp -l ciphers/*.[chS] $(DIR)
- cp -l debian/Makefile-2.6 $(DIR)/Makefile
+ cp -l Makefile *.[chS] loop.c* $(DIR)
touch $@
build: $(BUILD_STAMP)
$(BUILD_STAMP):
- $(MAKE) -C $(HEADERS_DIR) M=$(CURDIR)/$(DIR) $(JOBS_ARG) $(LOOP_AES_OPTIONS)
+ unset MAKEFLAGS && \
+ cd $(CURDIR)/$(DIR) && \
+ make LINUX_SOURCE=$(HEADERS_DIR) $(JOBS_ARG) $(LOOP_AES_OPTIONS) MODINST=n
touch $@
install: PACKAGE_DIR = debian/$(PACKAGE_NAME)
-install: DOC_DIR = $(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)
install:
- $(MAKE) -C $(HEADERS_DIR) M=$(CURDIR)/$(DIR) modules_install INSTALL_MOD_PATH=$(CURDIR)/$(PACKAGE_DIR) INSTALL_MOD_DIR=updates
+ $(MAKE) -C $(HEADERS_DIR) M=$(CURDIR)/$(DIR)/tmp-d-kbuild modules_install INSTALL_MOD_PATH=$(CURDIR)/$(PACKAGE_DIR) INSTALL_MOD_DIR=updates
cd $(PACKAGE_DIR)/lib/modules/$(VERSION)$(ABINAME)$(LOCALVERSION)/updates && ln loop.ko loop-aes.ko
-
- mkdir -p $(DOC_DIR)
- cp loop-AES/README $(DOC_DIR)/README
- cp loop-AES/ChangeLog $(DOC_DIR)/changelog
- cp ciphers/README $(DOC_DIR)/README.ciphers
- cp ciphers/ChangeLog $(DOC_DIR)/changelog.ciphers
binary-arch-flavour: DH_OPTIONS = -p$(PACKAGE_NAME) -p$(PACKAGE_LATEST)
binary-arch-flavour: install
- dh_installchangelogs
- dh_installdocs debian/README.Debian
+ dh_installchangelogs ChangeLog
+ dh_installdocs README debian/README.Debian
dh_installmodules
dh_compress
dh_fixperms
Modified: trunk/loop-aes/debian/source/rules
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes/debian/source/rules?rev=1399&op=diff
==============================================================================
--- trunk/loop-aes/debian/source/rules (original)
+++ trunk/loop-aes/debian/source/rules Thu May 17 18:29:04 2007
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
# loop-AES build options
-OPTIONS := KEYSCRUB=y PADLOCK=y RUNDM=n MODINST=n MODVERDIR=$(PWD)/symbols
+OPTIONS := KEYSCRUB=y PADLOCK=y EXTRA_CIPHERS=y
PACKAGE := loop-aes
MA_DIR ?= /usr/share/modass
@@ -28,8 +28,7 @@
build: build-stamp
build-stamp: configure
- $(MAKE) -C loop-AES $(OPTIONS) LINUX_SOURCE=$(KSRC)
- $(MAKE) -C ciphers $(OPTIONS) LINUX_SOURCE=$(KSRC)
+ $(MAKE) LINUX_SOURCE=$(KSRC) $(OPTIONS) RUNDM=n MODINST=n
touch build-stamp
install: install-stamp
@@ -37,9 +36,9 @@
# install modules
m=loop; \
for module in tmp-d-kbuild/$$m.ko $$m.ko $$m.o; do \
- if [ -f loop-AES/$$module ]; then \
+ if [ -f $$module ]; then \
mod=`basename $$module`; \
- install -m644 -b -D loop-AES/$$module $(MODDIR)/$$mod; \
+ install -m644 -b -D $$module $(MODDIR)/$$mod; \
break; \
fi \
done \
@@ -47,9 +46,10 @@
# loop_*
for m in loop_serpent loop_twofish loop_blowfish; do \
for module in tmp-d-kbuild/$$m.ko $$m.ko $$m.o; do \
- if [ -f ciphers/$$module ]; then \
+ if [ -f $$module ]; then \
mod=`basename $$module`; \
- install -m644 -b -D ciphers/$$module $(MODDIR)/$$mod; \
+ install -m644 -b -D $$module $(MODDIR)/$$mod; \
+ break; \
fi \
done \
done
@@ -60,11 +60,8 @@
dh_testdir
dh_testroot
dh_installdirs
- dh_installdocs loop-AES/README
- dh_installchangelogs loop-AES/ChangeLog
-
- cp ciphers/README $(DOCDIR)/README.ciphers
- cp ciphers/ChangeLog $(DOCDIR)/changelog.ciphers
+ dh_installdocs README
+ dh_installchangelogs ChangeLog
dh_compress
dh_fixperms
@@ -76,8 +73,7 @@
clean:
dh_testdir
dh_testroot
- $(MAKE) -C loop-AES clean
- $(MAKE) -C ciphers clean
+ $(MAKE) clean
rm -f build-stamp install-stamp
dh_clean
More information about the Pkg-loop-aes-commits
mailing list