Re: please unblock xtables-addons 1.26-2
On Thu, Aug 12, 2010 at 08:35:21PM +0100, Adam D. Barratt wrote:
> On Thu, 2010-08-12 at 17:09 +0200, Pierre Chifflier wrote:
> > xtables-addons 1.26-2 contains the following (important) changes:
> >
> > * Do not build the TEE target (Closes: #592237)
> > * Fix build not to use kernel headers when building source (Closes: #581779)
>
> Apologies if I'm missing something obvious, but I couldn't spot the fix
> for this in the debdiff; please could you explain how it is resolved?
>
Hi,
For an unknown reason it seems the debdiff only shows the second line
modified in debian/rules ...
Here are the relevant parts (in debian/rules):
* Do not build the TEE target (Closes: #592237)
-> solved by telling kernel Makefile to not build the module
diff --git a/debian/rules b/debian/rules
index ba57f2a..9f2965e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,6 +83,8 @@ configure-stamp: configure
# Add here commands to configure the package.
cp -f /usr/share/misc/config.sub config.sub
cp -f /usr/share/misc/config.guess config.guess
+ # do not build TEE (see #592237)
+ sed -i 's/build_TEE=m/build_TEE=n/' mconfig
./configure $(CROSS) --prefix=/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
@@ -150,6 +152,7 @@ clean:
rm -f config.sub config.guess
rm -f config.log config.status
rm -f build-arch-stamp build-indep-stamp configure-stamp
+ sed -i 's/build_TEE=.*/build_TEE=m/' mconfig
dh_clean
* Fix build not to use kernel headers when building source (Closes: #581779)
-> solved by using the right target (user-clean-local instead of clean)
for make. user-clean-local only removes the user libraries, while clean
use the kernel Makefile to remove the modules
--- a/debian/rules
+++ b/debian/rules
@@ -165,7 +168,7 @@ install: build
install -m 0644 extensions/ipset/ipset.8
$(CURDIR)/debian/$(cname)/usr/share/man/man8
#$(MAKE) install DESTDIR=$(CURDIR)/debian/$(cname)
- $(MAKE) -C extensions clean
+ $(MAKE) -C extensions user-clean-local
Cheers,
Pierre
Reply to: