Commit Graph

35 Commits (a04caa932789ee787f06bba08460a2c7cf4a55f8)

Author SHA1 Message Date
Jo-Philipp Wich 1de7d3dadd x86_64: fix invoking sysupgrade on PARTUUID mounted system
Fix sysupgrade to determine the correct boot block device to use if
/proc/cmdline contains a PARTUUID root.

Change the preinit move_config() hook to use the UUID scanning code
from sysupgrade in order to avoid code duplication.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42968 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-19 20:28:43 +00:00
Jo-Philipp Wich 826c353963 x86_64: unbreak squashfs images
Enable the required squashfs and block2mtd support in the kernel in order
to be able to actually boot them.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42967 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-19 17:58:46 +00:00
Jo-Philipp Wich fc13c5df1c x86_64: use default block2mtd timeout of 5s
If the underlying block device is a USB device it might require some
time to settle, observed when booting a squashfs image from sd card
on an Alix APU board.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42966 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-19 17:46:37 +00:00
Jo-Philipp Wich 02ef17870c x86_64: sysupgrade: consider hdX and vdX devices as well
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42965 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-19 17:13:50 +00:00
Jo-Philipp Wich 93e7f9f611 x86_64: support sysupgrade config restore on PARTUUID mounted disks
Fix the move_config() procedure to properly find the corresponding disk if
the rootfs was mounted by PARTUUID instead of a device node.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42946 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-17 22:50:38 +00:00
Jo-Philipp Wich 882e83a275 x86_64: add kmod-r8169 to the default packages
This kmod is required by the Alix APU 1D4 to be reachable after
installing an x86-64 image.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42945 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-17 13:09:37 +00:00
Jo-Philipp Wich 953e848636 x86_64: initial support for PARTUUID
This change configures grub to mount the rootfs by PARTUUID instead of the
device path if CONFIG_TARGET_ROOTFS_PARTNAME is unset.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42936 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-16 16:28:16 +00:00
John Crispin 81d9f2d585 scripts: fix wrong usage of '==' operator
[base-files] shell-scripting: fix wrong usage of '==' operator

normally the '==' is used for invoking a regex parser and is a bashism.
all of the fixes just want to compare a string. the used busybox-ash
will silently "ignore" this mistake, but make it portable/clean at least.

this patch does not change the behavior/logic of the scripts.

Signed-off-by: Bastian Bittorf <bittorf@bluebottle.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42911 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-14 12:21:11 +00:00
Luka Perkov e5441232a8 kernel: update 3.14 to 3.14.18
Targets were build tested and patches are refreshed.

Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42463 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-09-10 21:40:19 +00:00
Luka Perkov 7a2b8a48f6 kernel: update 3.14 to 3.14.16
Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42070 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-08-08 13:38:22 +00:00
Luka Perkov 07f49dbd27 kernel: update 3.14 to 3.14.14
Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41898 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-30 15:44:44 +00:00
Luka Perkov c04ed164b0 kernel: update 3.14 to 3.14.12
Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41582 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-11 13:28:44 +00:00
Luka Perkov 1b59aa4310 kernel: update 3.14 to 3.14.11
Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41551 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-08 22:44:34 +00:00
Luka Perkov e898954fd2 kernel: update 3.14 to 3.14.10
Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41533 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-06 18:10:49 +00:00
Luka Perkov b0eae8648b kernel: update 3.14 to 3.14.9
Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41362 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-27 21:10:02 +00:00
Luka Perkov e137e0e5b0 kernel: update 3.14 to 3.14.8
Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41309 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-24 12:27:36 +00:00
Luka Perkov a6e15f8060 kernel: update 3.14 to 3.14.7
Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41150 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-11 23:39:54 +00:00
John Crispin 38c81b2552 target/linux/*/base-files/lib/upgrade/platform.sh - wrong check for ARGC
ARGC is a 'C-ism', but not known/valid in shell-syntax - insert the correct
var $# (=number of args) here. under normal conditions this had no impact,
but we should at least correct it. the error was observable like this:

root@box:~ [ -e "/etc/functions.sh" ] && . /etc/functions.sh
root@box:~ [ -e "/lib/functions.sh" ] && . /lib/functions.sh
root@box:~ . /lib/upgrade/platform.sh
root@box:~ . /lib/upgrade/common.sh
root@box:~ platform_check_image /tmp/myfirmware.bin
ash: bad number
root@box:~ echo $?
0

Signed-off-by: Bastian Bittorf <bittorf@bluebottle.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40915 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-02 12:43:22 +00:00
Luka Perkov e23676609b kernel: update 3.14 to 3.14.5
Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40901 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-02 09:25:33 +00:00
Luka Perkov 164fe72921 kernel: update 3.14 to 3.14.4
Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40769 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-05-14 21:49:27 +00:00
Hauke Mehrtens af992d94f2 kernel: update to kernel 3.14.3
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40736 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-05-08 21:53:27 +00:00
Felix Fietkau 604c39ac26 x86_64: enable high res timers by default
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40698 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-05-05 18:44:46 +00:00
Felix Fietkau 50349a4955 x86_64: add usb support (including storage) to the kernel config
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40455 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-04-11 13:22:28 +00:00
Imre Kaloz d6665ff15c [x86_64]: generate esxi compatible vmdks, too
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40452 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-04-11 10:19:26 +00:00
Imre Kaloz 0ae0a59e5e [x86_64]: reuqire qemu-img to be installed (the one we have in tools is too old)
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40451 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-04-11 10:14:57 +00:00
Imre Kaloz eccd1c97b3 [x86_64]: specify the adapter type for the vmdk conversion
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40442 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-04-10 11:09:27 +00:00
Imre Kaloz 1f25b5788f [x86_64]: enable native KVM and VMware drivers
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>



git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40434 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-04-09 11:54:44 +00:00
Imre Kaloz 0914d85469 [x86_64]: upgrade to 3.14
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40433 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-04-09 11:46:18 +00:00
Imre Kaloz c5b682a718 upgrade 3.13 targets to 3.13.7
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>



git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40022 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-03-26 11:34:39 +00:00
Felix Fietkau 46003ab374 x86_64: fix sysupgrade
Function move_config should be called after or during preinit_mount_root
hook in do_mount_root function. At this state sysupgrade.tgz is not in its
place during that time when do_mount_root is called. Function move_config
is called later so the sysupgrade.tgz stays in root directory to the second
restart when it is unpacked properly.

This patch adds move_config function to preinit_mount_root hook instead
of preinit_main and changes the filename of script to be called before
80_mount_root is called. It will prepare the sysupgrade archive for do_mount_root
within preinit_mount_root hook.

This issue was introduced for target x86. Since the target for x86_64 is
similar to x86, this issue is present also in this target. It solves the
ticket #15042 and #14088.

Signed-off-by: Jiri Slachta <slachta@cesnet.cz>
Tested-By: Stefan Hellermann <stefan@the2masters.de>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39997 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-03-21 15:55:11 +00:00
Imre Kaloz 2aeabcb857 upgrade 3.13 targets to 3.13.2, refresh patches
Signed-off-by: Imre Kaloz <kaloz@openwrt.org


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39582 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-02-13 13:27:14 +00:00
Imre Kaloz 333b68b567 [x86_64]: upgrade to 3.13.1
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>



git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39525 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-02-07 16:51:01 +00:00
Gabor Juhos ae7072b9ff kernel: update 3.10 to 3.10.28
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39399 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-01-26 11:30:34 +00:00
Gabor Juhos d3305e8570 kernel: update 3.10 to 3.10.26
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39220 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-01-11 16:06:37 +00:00
Imre Kaloz b3160a58e8 add x86_64 target support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>



git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39208 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-01-07 12:23:35 +00:00