forcemerge 588126 588178
tags 588126 + patch
thanks
On 2010-07-12 16:17 +0200, Michal Hocko wrote:
> It seems that generated debian/control file uses version rather than
> KERNELRELEASE varible which means that extra/local verion doesn't get
> into the file and the package build fails.
>
> The following patch should help, I guess:
>
> --- /usr/share/kernel-package/ruleset/targets/common.mk.old 2010-07-12
> 16:05:11.000000000 +0200
> +++ /usr/share/kernel-package/ruleset/targets/common.mk 2010-07-12
> 16:06:17.000000000 +0200
> @@ -231,7 +231,7 @@
> cp -af $(LIBLOC)/$$dir ./debian/; \
> done
> install -p -m 755 $(LIBLOC)/rules debian/rules
> - sed -e 's/=V/$(version)/g' \
> + sed -e 's/=V/$(KERNELRELEASE)/g' \
> -e 's/=D/$(debian)/g' -e 's/=A/$(DEB_HOST_ARCH)/g' \
> -e 's/=SA/$(INT_SUBARCH)/g' \
> -e 's/=I/$(initrddep)/g' \
> @@ -247,7 +247,7 @@
> test ! -d $(strip $(KPKG_OVERLAY_DIR)) || \
> (cd $(strip $(KPKG_OVERLAY_DIR)); tar cf - . | (cd
> $(SRCTOP)/debian; umask 000; tar xsf -))
> test ! -f $(strip $(KPKG_OVERLAY_DIR))/Control || \
> - sed -e 's/=V/$(version)/g' \
> + sed -e 's/=V/$(KERNELRELEASE)/g' \
> -e 's/=D/$(debian)/g' -e 's/=A/$(DEB_HOST_ARCH)/g' \
> -e 's/=SA/$(INT_SUBARCH)/g' \
> -e 's/=I/$(initrddep)/g' \
> @@ -256,7 +256,7 @@
> -e 's/=ST/$(INT_STEM)/g' -e 's/=B/$(KERNEL_ARCH)/g' \
> $(strip $(KPKG_OVERLAY_DIR))/Control > debian/control
> test ! -f $(strip $(KPKG_OVERLAY_DIR))/changelog || \
> - sed -e 's/=V/$(version)/g' \
> + sed -e 's/=V/$(KERNELRELEASE)/g' \
> -e 's/=D/$(debian)/g' -e 's/=A/$(DEB_HOST_ARCH)/g' \
> -e 's/=ST/$(INT_STEM)/g' -e 's/=B/$(KERNEL_ARCH)/g' \
> -e 's/=M/$(maintainer) <$(email)>/g' \
>
> Btw. I have noticed some other places where version->KERNELRELEASE might
> make sense as well, like the following one:
>
> --- /usr/share/kernel-package/ruleset/targets/image.mk.old 2010-07-12
> 16:16:28.000000000 +0200
> +++ /usr/share/kernel-package/ruleset/targets/image.mk 2010-07-12
> 16:16:42.000000000 +0200
> @@ -288,7 +288,7 @@
> $(DEBDIR)/pkg/image/prerm > $(TMPTOP)/DEBIAN/prerm
> chmod 755 $(TMPTOP)/DEBIAN/prerm
> $(INSTALL_TEMPLATE)
> - sed -e 's/=V/$(version)/g' -e 's/=IB/$(link_in_boot)/g' \
> + sed -e 's/=V/$(KERNELRELEASE)/g' -e 's/=IB/$(link_in_boot)/g' \
> -e 's/=ST/$(INT_STEM)/g' -e 's/=R/$(reverse_symlink)/g' \
> -e 's/=KPV/$(kpkg_version)/g' \
> -e 's/=K/$(kimage)/g' \
Kudos to you for examining this. Here is a patch against the source
package for those who don't want to change installed files:
--8<---------------cut here---------------start------------->8---
diff -Nru kernel-package-12.033/kernel/ruleset/targets/common.mk
kernel-package-12.033sven1/kernel/ruleset/targets/common.mk
--- kernel-package-12.033/kernel/ruleset/targets/common.mk 2010-02-15
05:28:16.000000000 +0100
+++ kernel-package-12.033sven1/kernel/ruleset/targets/common.mk 2010-07-12
16:45:09.000000000 +0200
@@ -231,7 +231,7 @@
cp -af $(LIBLOC)/$$dir ./debian/; \
done
install -p -m 755 $(LIBLOC)/rules debian/rules
- sed -e 's/=V/$(version)/g' \
+ sed -e 's/=V/$(KERNELRELEASE)/g' \
-e 's/=D/$(debian)/g' -e 's/=A/$(DEB_HOST_ARCH)/g' \
-e 's/=SA/$(INT_SUBARCH)/g' \
-e 's/=I/$(initrddep)/g' \
@@ -247,7 +247,7 @@
test ! -d $(strip $(KPKG_OVERLAY_DIR)) || \
(cd $(strip $(KPKG_OVERLAY_DIR)); tar cf - . | (cd $(SRCTOP)/debian;
umask 000; tar xsf -))
test ! -f $(strip $(KPKG_OVERLAY_DIR))/Control || \
- sed -e 's/=V/$(version)/g' \
+ sed -e 's/=V/$(KERNELRELEASE)/g' \
-e 's/=D/$(debian)/g' -e 's/=A/$(DEB_HOST_ARCH)/g' \
-e 's/=SA/$(INT_SUBARCH)/g' \
-e 's/=I/$(initrddep)/g' \
@@ -256,7 +256,7 @@
-e 's/=ST/$(INT_STEM)/g' -e 's/=B/$(KERNEL_ARCH)/g' \
$(strip $(KPKG_OVERLAY_DIR))/Control > debian/control
test ! -f $(strip $(KPKG_OVERLAY_DIR))/changelog || \
- sed -e 's/=V/$(version)/g' \
+ sed -e 's/=V/$(KERNELRELEASE)/g' \
-e 's/=D/$(debian)/g' -e 's/=A/$(DEB_HOST_ARCH)/g' \
-e 's/=ST/$(INT_STEM)/g' -e 's/=B/$(KERNEL_ARCH)/g' \
-e 's/=M/$(maintainer) <$(email)>/g' \
diff -Nru kernel-package-12.033/kernel/ruleset/targets/image.mk
kernel-package-12.033sven1/kernel/ruleset/targets/image.mk
--- kernel-package-12.033/kernel/ruleset/targets/image.mk 2009-11-17
08:47:50.000000000 +0100
+++ kernel-package-12.033sven1/kernel/ruleset/targets/image.mk 2010-07-12
16:46:33.000000000 +0200
@@ -288,7 +288,7 @@
$(DEBDIR)/pkg/image/prerm > $(TMPTOP)/DEBIAN/prerm
chmod 755 $(TMPTOP)/DEBIAN/prerm
$(INSTALL_TEMPLATE)
- sed -e 's/=V/$(version)/g' -e 's/=IB/$(link_in_boot)/g' \
+ sed -e 's/=V/$(KERNELRELEASE)/g' -e 's/=IB/$(link_in_boot)/g' \
-e 's/=ST/$(INT_STEM)/g' -e 's/=R/$(reverse_symlink)/g' \
-e 's/=KPV/$(kpkg_version)/g' \
-e 's/=K/$(kimage)/g' \
--8<---------------cut here---------------end--------------->8---
Cheers,
Sven
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
