Users may have merge.ff set to false, which will force merge commits to
be generated. The intent here is to have a fast-forward merge when
possible, so let's make sure fast-forwards are enabled.
Signed-off-by: John Szakmeister <john@szakmeister.net>
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 37884
Looking at the target 'defconfig' in include/toplevel, it doesn't
directly reference $(HOME)/.openwrt/defconfig nor does it reference any
prerequisites using it as a target.
Therefore, building "defconfig" as a target uses the defaults in the
tree, but not the defaults that a user might have explicitly specified.
This patch fixes this regression from r36361.
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
[florian: apply with the proper patch level, wrap at 80 columns]
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 37883
Every device I connect to the USB port is detected as 2-1, not 1-1.
So adjust the default setting accordingly.
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 37882
When the squashfs and jffs2 images are generated
in the same turn, the compressed kernel images
are generated twice with the same parameters.
Move compressed kernel generation into a separate
phase to avoid that.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 37881
The myloader partition parser code uses ifdef wrappers
to make the code usable on kernels below version 3.2.
All targets are using kernel 3.3 at least so the wraper
is not needed. Remove that.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 37880
Those are not needed since we are generating the
initramfs images along with the others.
Remove the variables and use the template names
directly.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 37876
The package makes it possible to create custom SPI
buses via GPIO lines.
This module is based on i2c-gpio-custom and allows to
configure an SPI bus via GPIO lines and expose it to
userspace without rebuilding the kernel. This is maily
intended to connect microcontrollers and other simple
SPI devices without making an ad-hoc kernel driver.
Signed-off-by: Marco Burato <zmaster.adsl@gmail.com>
[juhosg:
- change subject,
- extend and reformat commit message,
- cleanup checkpatch errors/warnings in module source]
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 37872
Initramfs images are not generated for profiles which
are using the squashfs-only template. Add the missing
'Image/Build/Template/squashfs-only/initramfs' to fix
that.
Also, 'Image/Build/Cameo933x/initramfs' uses wrong
parameters for 'MkuImageLzma/initramfs' due to a
misplaced commma. Remove that to fix the generated
initramfs images.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 37871
Taken from the 'alix2: update to LINUX_VERSION 3.10.9'
patch: http://patchwork.openwrt.org/patch/3971/.
Russell says in the original patch:
"Initial whack at updating alix2 to a current kernel. It builds
and runs without problems so far. I copied target/linux/config-3.8,
target/linux/x86/alix2/config-3.8, and target/linux/patches-3.8 to
their 3.10 equivalents and tweaked until it built. The patches
required no changes."
Signed-off-by: Russell Senior <russell@personaltelco.net>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 37869
Taken from the 'alix2: update to LINUX_VERSION 3.10.9'
patch: http://patchwork.openwrt.org/patch/3971/.
Russell says in the original patch:
"Initial whack at updating alix2 to a current kernel. It builds
and runs without problems so far. I copied target/linux/config-3.8,
target/linux/x86/alix2/config-3.8, and target/linux/patches-3.8 to
their 3.10 equivalents and tweaked until it built. The patches
required no changes."
The current patch contains additional configuration tweaks.
Signed-off-by: Russell Senior <russell@personaltelco.net>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 37868
Add kernel configuration and patches for Linux 3.10.
Taken from the 'alix2: update to LINUX_VERSION 3.10.9'
patch: http://patchwork.openwrt.org/patch/3971/.
Russell says in the original patch:
"Initial whack at updating alix2 to a current kernel. It builds
and runs without problems so far. I copied target/linux/config-3.8,
target/linux/x86/alix2/config-3.8, and target/linux/patches-3.8 to
their 3.10 equivalents and tweaked until it built. The patches
required no changes."
The current patch contains additional configuration tweaks,
and the kernel patches were refreshed.
Signed-off-by: Russell Senior <russell@personaltelco.net>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 37867
The 'Warning: unable to open an initial console' message
indicates an error in the rootfs. Remove the patch which
hides the warning.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 37848
Linux expects that the /dev/console node is present in
the rootfs image. Create the node in rootfs images, in
order to make std{in,out,err} usable even in early init
process.
Note: tar.gz and cpio.gz images are not handled yet.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 37847
Linux expects that the /dev/console node is present
in the rootfs image. Create the node in initramfs,
in order to make std{in,out,err} usable even in early
init process.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 37846
