Re: Unofficial forward-ported grsec 4.9 Qubes kernel branch

[nicholas roveda]

I'm trying to build your port, but I,ve actually had to to some changes to `kernel.spec` because the script exits with an error at line 136: `%_sourcedir/check-for-config-changes .config.orig .config`.

So, here are my changes.

Original:

117 if [ -f %_sourcedir/config-%{version} ]; then
118 cp %_sourcedir/config-%{version} .config
119 else
120 cp %_sourcedir/config .config
121 fi
...
130 MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
131 if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
132 yes '' | make oldconfig $MAKE_ARGS
133 else
134 cp .config .config.orig
135 make silentoldconfig $MAKE_ARGS < /dev/null
136 %_sourcedir/check-for-config-changes .config.orig .config
137 rm .config.orig
138 fi


My version:

117 if [ -f %_sourcedir/config-%{version} ]; then
118 cp %_sourcedir/config-%{version} .config
119 else
120 cp %_sourcedir/config .config
+++ cat /proc/config.gz | unzip > .config.current
121 fi
...
130 MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
131 if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
132 yes '' | make oldconfig $MAKE_ARGS
133 else
134 cp .config .config.orig
+++ cp .config.current .config
135 make silentoldconfig $MAKE_ARGS < /dev/null
--- %_sourcedir/check-for-config-changes .config.orig .config
+++ %build_src_dir/scripts/kconfig/merge_config.sh .config .config.orig
137 rm .config.orig
138 fi


I don't know if this issue is related to my configuration or not, let me know.