Merge remote-tracking branch 'x/master'

* x/master:
  kernel-snapshot: properly use our version in CONFIG_LOCALVERSION.
  kernel: properly use our version in CONFIG_LOCALVERSION.
This commit is contained in:
davehome 2012-07-08 10:48:15 -06:00
commit ed945bf520
2 changed files with 4 additions and 6 deletions

View file

@ -58,9 +58,8 @@ do_configure() {
msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
make ${makejobs} defconfig && make ${makejobs} allmodconfig
fi
if [ -n "${revision}" ]; then
sed -i -e "s|\(LOCALVERSION\)=\"\"|\1=\"_${revision}\"|" .config
fi
# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
}
do_build() {

View file

@ -53,9 +53,8 @@ do_configure() {
msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
make ${makejobs} defconfig && make ${makejobs} allmodconfig
fi
if [ -n "${revision}" ]; then
sed -i -e "s|\(LOCALVERSION\)=\"\"|\1=\"_${revision}\"|" .config
fi
# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
}
do_build() {