Commit Graph

75 Commits

Author SHA1 Message Date
Michael Liebmann
c6a526cbc4 Apollo/Kronos: Use backup with readmtdJFFS2() also for var partition
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6121e57fbc
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-09-22 (Tue, 22 Sep 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-09-22 13:41:13 +02:00
Thilo Graf
946c0e8bc4 Merge branch 'cst-next.pre' into cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: a58f1621b4
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-30 (Thu, 30 Apr 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-04-30 09:20:43 +02:00
vanhofen
32365276ef remove w_max()-calls to define menu-width, because ...
w-max() returns a pixel-value, but menus need a percentage-value.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9041bff59c
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-24 (Fri, 24 Apr 2015)

Origin message was:
------------------
- remove w_max()-calls to define menu-width, because ...

 w-max() returns a pixel-value, but menus need a percentage-value.


------------------
This commit was generated by Migit
2015-04-24 09:11:04 +02:00
Thilo Graf
e340bc999e CFlashUpdate: change name for CFile object for better differ
Origin commit data
------------------
Branch: ni/coolstream
Commit: e58b86f38f
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-12-20 (Sat, 20 Dec 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-03-29 22:40:03 +02:00
[CST] Focus
186bbef1ba gui/update.cpp: fix image update check,
enable save u-boot menu switch


Origin commit data
------------------
Branch: ni/coolstream
Commit: f04e22befe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-09 (Fri, 09 Jan 2015)



------------------
This commit was generated by Migit
2015-01-09 12:42:01 +03:00
[CST] Focus
06788b0daf gui/update.cpp: add function to check first url for image update;
check update version and timestamp to notify user about updates


Origin commit data
------------------
Branch: ni/coolstream
Commit: a755074c0e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-20 (Mon, 20 Oct 2014)



------------------
This commit was generated by Migit
2014-10-20 14:19:37 +04:00
Michael Liebmann
2d0db89dca SoftUpdate: Hide "Create image for Tank/Trinity STB" at the Kronos platform
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e6ad3caa1
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-09-01 (Mon, 01 Sep 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-09-01 21:14:09 +02:00
Michael Liebmann
5f6a4bd32f CFlashExpert::checkSize: Fix display backupMaxSize & backupRequiredSize
Origin commit data
------------------
Branch: ni/coolstream
Commit: 583931e446
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-29 (Wed, 29 Jan 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-01-29 21:20:43 +01:00
vanhofen
35830797d6 adapt ShowMsg handling from martii's neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 53f5801d6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-22 (Wed, 22 Jan 2014)

Origin message was:
------------------
- adapt ShowMsg handling from martii's neutrino-mp

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-01-22 12:37:21 +01:00
vanhofen
ae8cfd7dc2 adapt ShowHint handling from martii's neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6995e1a765
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-22 (Wed, 22 Jan 2014)

Origin message was:
------------------
- adapt ShowHint handling from martii's neutrino-mp

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-01-22 12:11:52 +01:00
Michael Liebmann
9cf6b04250 SNeutrinoSettings: convert more char[...] configuration values to std::string
Origin commit data
------------------
Branch: ni/coolstream
Commit: 004aa84e32
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-18 (Sat, 18 Jan 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-01-19 20:57:37 +01:00
Michael Liebmann
7b4e3bc03b Preparing the menu classes for Lua Part #2
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii


Origin commit data
------------------
Branch: ni/coolstream
Commit: b41819190d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-16 (Thu, 16 Jan 2014)

Origin message was:
------------------
Preparing the menu classes for Lua Part #2

- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii


------------------
This commit was generated by Migit
2014-01-19 20:57:37 +01:00
Michael Liebmann
917e8aafa4 Preparing the menu classes for Lua Part #1
- Remove CNonLocalizedMenuSeparator
- Add overloaded function CMenuSeparator for non local
 THX Martii


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c9c9debcc
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-16 (Thu, 16 Jan 2014)

Origin message was:
------------------
Preparing the menu classes for Lua Part #1

- Remove CNonLocalizedMenuSeparator
- Add overloaded function CMenuSeparator for non local
 THX Martii


------------------
This commit was generated by Migit
2014-01-19 20:57:37 +01:00
martii
7ebfe9959d convert most char[...] configuration values to std::string
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: cbc9299df8
Author: martii <m4rtii@gmx.de>
Date: 2013-06-11 (Tue, 11 Jun 2013)



------------------
This commit was generated by Migit
2013-12-25 12:08:14 +01:00
[CST] Focus
98b0fbcc10 gui/update.cpp: fix memleak
Origin commit data
------------------
Branch: ni/coolstream
Commit: a438c0548b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-29 (Fri, 29 Nov 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-11-29 17:27:10 +04:00
Stefan Seyfried
fa17927b89 fix format string warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 630c66330d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-11-13 10:38:27 +01:00
vanhofen
ab706e449e locale: remove confusing string 'squashFS'
Origin commit data
------------------
Branch: ni/coolstream
Commit: c239f7af95
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-10-23 (Wed, 23 Oct 2013)

Origin message was:
------------------
- locale: remove confusing string 'squashFS'

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-10-23 10:41:47 +02:00
Michael Liebmann
9221700b3d Fix compiler warnings (-Wconversion)
Origin commit data
------------------
Branch: ni/coolstream
Commit: b645b644b0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-10-08 (Tue, 08 Oct 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-10-10 01:58:37 +02:00
Michael Liebmann
b696f83f9d neutrino: Fit various functions to the changed at get_fs_usage()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4ee8fded80
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-10-08 (Tue, 08 Oct 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-10-10 01:58:37 +02:00
Michael Liebmann
64493268bd CFlashExpert::showMTDSelector(): Fixed typo at 'disable write uboot'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 00a194990e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-10-01 (Tue, 01 Oct 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-10-01 20:42:01 +02:00
Michael Liebmann
cc7827815d CFlashExpertSetup: Disable backup u-boot
Origin commit data
------------------
Branch: ni/coolstream
Commit: 96fd0ef59d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-29 (Sun, 29 Sep 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-09-29 11:44:07 +02:00
Michael Liebmann
ae86076a8e CFlashExpert: Exclude 'env' from write flash
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4cb2465665
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-29 (Sun, 29 Sep 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-09-29 11:42:53 +02:00
Michael Liebmann
a059ae3c95 CFlashExpert: Use findMTDNumberFromName() to find mtdnumber
Origin commit data
------------------
Branch: ni/coolstream
Commit: b25b1c4fb5
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-28 (Sat, 28 Sep 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-09-28 07:29:57 +02:00
Michael Liebmann
41b27e957f Image backup apollo Part #6
- Menu option for including kernel/uldr/u-boot in the image backup
- Menu option for creating an image with a different erasesize
 Tank <=> Trinity


Origin commit data
------------------
Branch: ni/coolstream
Commit: d00cb6f8ec
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-24 (Tue, 24 Sep 2013)

Origin message was:
------------------
Image backup apollo Part #6

- Menu option for including kernel/uldr/u-boot in the image backup
- Menu option for creating an image with a different erasesize
 Tank <=> Trinity


------------------
This commit was generated by Migit
2013-09-27 06:44:43 +02:00
Michael Liebmann
0640f336eb Image backup apollo Part #5
- Rework handling devtable
- Use file for devtable '/var/tuxbox/config/devtable.txt'
- If file is empty or does not exist, will default entries
 '/dev/console' and '/dev/null' creates


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9188c78751
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-24 (Tue, 24 Sep 2013)

Origin message was:
------------------
Image backup apollo Part #5

- Rework handling devtable
- Use file for devtable '/var/tuxbox/config/devtable.txt'
- If file is empty or does not exist, will default entries
 '/dev/console' and '/dev/null' creates


------------------
This commit was generated by Migit
2013-09-27 06:44:43 +02:00
Michael Liebmann
9deb0fe4c3 Image backup apollo Part #4
- Check of available disk space before image creation


Origin commit data
------------------
Branch: ni/coolstream
Commit: 23163e7897
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-22 (Sun, 22 Sep 2013)



------------------
This commit was generated by Migit
2013-09-27 06:44:41 +02:00
Michael Liebmann
ddf0857e14 src/system/mtdutils: Creation devtable moved to update.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 66b078cb92
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-22 (Sun, 22 Sep 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-09-27 06:44:41 +02:00
Michael Liebmann
4744ca8a7d Image backup apollo Part #3
- Add ".256k" string to imagename for tank boxes


Origin commit data
------------------
Branch: ni/coolstream
Commit: acea9818b8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-21 (Sat, 21 Sep 2013)



------------------
This commit was generated by Migit
2013-09-27 06:44:39 +02:00
Michael Liebmann
0c311bd0da Image backup apollo Part #1
- Use src/system/mtdutils for image creation


Origin commit data
------------------
Branch: ni/coolstream
Commit: d4ca6a552e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-21 (Sat, 21 Sep 2013)



------------------
This commit was generated by Migit
2013-09-27 06:44:36 +02:00
Michael Liebmann
d71b84c8e4 CFlashExpert: Add return value to showMTDSelector() & showFileSelector()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 720f52c0a0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-26 (Thu, 26 Sep 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-09-27 06:44:33 +02:00
Michael Liebmann
e9e63f8405 gui/update.cpp: disable apply settings on apollo, as non-working at the moment
Origin commit data
------------------
Branch: ni/coolstream
Commit: df2fab4ceb
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-08-21 (Wed, 21 Aug 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-08-21 06:32:18 +02:00
Michael Liebmann
b38fc011c8 Softupdate: Skip checkSize() when update_dir=/tmp on non apollo platform
- supplement to 62a14b8c74


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8eacdd6e09
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-08-20 (Tue, 20 Aug 2013)



------------------
This commit was generated by Migit
2013-08-21 06:32:10 +02:00
Michael Liebmann
90bf93c597 Softupdate: Fix filename for local update
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9b12442b5d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-08-20 (Tue, 20 Aug 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-08-21 06:32:10 +02:00
Michael Liebmann
62a14b8c74 Softupdate: Check the available disk space when reading the flash
Origin commit data
------------------
Branch: ni/coolstream
Commit: a3762416af
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-08-20 (Tue, 20 Aug 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-08-20 02:55:56 +02:00
Michael Liebmann
903f661ee8 Softupdate: Use user-defined file names
for apply settings and saving partitions from the flash.


Origin commit data
------------------
Branch: ni/coolstream
Commit: bc069b0a84
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-08-08 (Thu, 08 Aug 2013)



------------------
This commit was generated by Migit
2013-08-20 02:55:54 +02:00
Michael Liebmann
2f3a350932 gui/update.cpp: disable "systemFS with settings" menu item on apollo,
as non-working at the moment


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0cc83a6a9f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-08-17 (Sat, 17 Aug 2013)



------------------
This commit was generated by Migit
2013-08-17 20:56:26 +02:00
[CST] Focus
9b7f005524 gui/update.cpp: download different image for different system fs erase size
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8ade9f656b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-08-05 (Mon, 05 Aug 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-08-06 15:16:54 +04:00
[CST] Focus
9121f33bc8 gui/update.cpp: hide progress window, if applySettings() failed
Origin commit data
------------------
Branch: ni/coolstream
Commit: d7bdd4ee6e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-18 (Tue, 18 Jun 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-06-18 16:22:34 +04:00
Michael Liebmann
07268967ab Software update: Copy flashimage to /tmp if it is not present in this directory
- unmount mounted network folders before flashing
- kill timerd before flashing


Origin commit data
------------------
Branch: ni/coolstream
Commit: c780676ce5
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-12 (Wed, 12 Jun 2013)



------------------
This commit was generated by Migit
2013-06-13 01:36:03 +02:00
Michael Liebmann
281a5d8f81 Software update: Rework preparing the flash process
- Finish all unnecessary threads and processes before the flash process
- Use flash.start to stop other (user-defined) processes


Origin commit data
------------------
Branch: ni/coolstream
Commit: c26fd64759
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-08 (Sat, 08 Jun 2013)

Origin message was:
------------------
* Software update: Rework preparing the flash process

- Finish all unnecessary threads and processes before the flash process
- Use flash.start to stop other (user-defined) processes


------------------
This commit was generated by Migit
2013-06-08 16:20:32 +02:00
Michael Liebmann
301a522b57 Software update: Apply the settings in the options menu switchable
Origin commit data
------------------
Branch: ni/coolstream
Commit: 365661e841
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-08 (Sat, 08 Jun 2013)

Origin message was:
------------------
* Software update: Apply the settings in the options menu switchable

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-06-08 16:20:32 +02:00
[CST] Focus
6042fb95d8 Merge branch 'next' of coolstreamtech.de:cst-public-gui-neutrino into next
Conflicts:
	lib/libconfigfile/configfile.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: aa60c85768
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-07 (Thu, 07 Mar 2013)



------------------
This commit was generated by Migit
2013-03-07 17:10:57 +04:00
Stefan Seyfried
767be83e22 helpers: improve my_system function
Instead of hardcoding the maximum number of arguments to the
my_system helper, pass a variable argument list.
The function is deliberately source-incompatible with the old
implementation (as opposed to a variant with a sentinel NULL
argument, which would be compatible) to find all users and to
make sure that new future users of this function are not
overlooked during merges with other branches.

Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 988a8ebec2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)



------------------
This commit was generated by Migit
2013-03-05 11:58:49 +01:00
[CST] Focus
20873fc6e9 gui/update.cpp: use mtd0 as default on apollo, disable uboot/uldr partitions write
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5f105f2ee3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-29 14:24:47 +04:00
Thilo Graf
76a0ef0797 extended update: move ext_update.* to update_ext.*
Beware the canonical order of filenames.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9939fc9197
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-01-13 (Sun, 13 Jan 2013)



------------------
This commit was generated by Migit
2013-01-14 15:31:43 +01:00
[CST] Focus
9968abbbf2 gui/update.cpp: add local variable for update mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ac735d0ec
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-16 (Fri, 16 Nov 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-11-16 19:47:25 +04:00
[CST] Focus
cdeb632164 gui/update.cpp: return result from file browser or image select menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 76947173c0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-16 (Fri, 16 Nov 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-11-16 16:49:58 +04:00
Michael Liebmann
54eb637abe Software Update with apply the settings (Part9)
- Functions now available for internet & local update.
- Rename writemtdExt() to applySettings()


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0c84840e10
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-11-05 (Mon, 05 Nov 2012)

Origin message was:
------------------
* Software Update with apply the settings (Part9)

- Functions now available for internet & local update.
- Rename writemtdExt() to applySettings()


------------------
This commit was generated by Migit
2012-11-07 04:06:48 +01:00
Michael Liebmann
2111213cf3 Software Update with apply the settings (Part2)
- Use g_settings.update_dir for directory Expert functions


Origin commit data
------------------
Branch: ni/coolstream
Commit: f0463c3044
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-04-18 (Wed, 18 Apr 2012)

Origin message was:
------------------
* Software Update with apply the settings (Part2)

- Use g_settings.update_dir for directory Expert functions


------------------
This commit was generated by Migit
2012-10-25 01:10:36 +01:00
Michael Liebmann
a3dd812987 Software Update with apply the settings (Part1)
- Settings are applied to the image before flashing
- Use the function on the menu "Software Update => Expert functions
 => Write one partition => systemFS with settings"
- Log output to /tmp/update.log for testing
- Use settingsupdate.conf as config file


Origin commit data
------------------
Branch: ni/coolstream
Commit: b001b36f4a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-04-13 (Fri, 13 Apr 2012)

Origin message was:
------------------
* Software Update with apply the settings (Part1)

- Settings are applied to the image before flashing
- Use the function on the menu "Software Update => Expert functions
 => Write one partition => systemFS with settings"
- Log output to /tmp/update.log for testing
- Use settingsupdate.conf as config file


------------------
This commit was generated by Migit
2012-10-25 01:10:35 +01:00