- hack for 3.3 kernel for x86 arch

Changed files:
    rpm-build-macros.spec -> 1.328
    rpm.macros -> 1.649

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index ce95726ecf3b230dfc5e0e9f1f639c0c67eebc47..8124621f9a551cbcc1e972b609876bd0c380af9a 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define                rpm_macros_rev  1.648
+%define                rpm_macros_rev  1.649
 %define                find_lang_rev   1.35
 Summary:       PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD

diff --git a/rpm.macros b/rpm.macros
index 1fc3a04ed9b2dfeba0e43df964aaf7a281e9b13d..9bcf7a7d3b57f768f0311ba589eb7b141a799d0c 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -1651,7 +1651,7 @@ compile() {                                                                                                                       \
                                                                                                                                        \
        [ -r "%{_kernelsrcdir}/.config" ] || exit 1                                             \
        rm -rf o                                                                                                                \
-       install -d o/include/linux o/include/generated o/arch/powerpc/lib       \
+       install -d o/include/linux o/include/generated o/arch/x86/include o/arch/powerpc/lib    \
        ln -sf %{_kernelsrcdir}/.config o/.config                                               \
        ln -sf %{_kernelsrcdir}/Module.symvers o/Module.symvers                 \
        if [ -f %{_kernelsrcdir}/include/generated/autoconf.h ]; then   \
@@ -1659,6 +1659,9 @@ compile() {                                                                                                                       \
                ln -s ../generated/autoconf.h o/include/linux/autoconf.h        \
        else                                                                                                                    \
                ln -sf %{_kernelsrcdir}/include/linux/autoconf.h o/include/linux/autoconf.h \
+       fi                                                                                                                              \
+       if [ -d %{_kernelsrcdir}/arch/x86/include/generated ]; then             \
+               ln -s %{_kernelsrcdir}/arch/x86/include/generated o/arch/x86/include    \
        fi                                                                                                                              \
                                                                                                                                        \
        set +x                                                                                                                  \