Commit Graph

99 Commits

Author SHA1 Message Date
Arne Fitzenreiter
20c7552e0d Merge branch 'master' into next
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2019-04-26 19:39:55 +02:00
Michael Tremer
7af7ced6fc Start Core Update 132
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-04-20 14:07:43 +01:00
Arne Fitzenreiter
a2907cdd9f Merge remote-tracking branch 'origin/master' into next
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2019-04-11 07:30:26 +02:00
Michael Tremer
b450e7e3e6 Start Core Update 130
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-03-14 13:15:03 +00:00
Michael Tremer
b5ef99df2c Start Core Update 129
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-02-25 00:47:28 +00:00
Arne Fitzenreiter
9b86a7ec28 Merge remote-tracking branch 'origin/master' into next 2019-01-19 19:58:48 +01:00
Michael Tremer
5a39464754 Start Core Update 128
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-01-17 14:38:01 +00:00
Michael Tremer
66f7b646cd Start Core Update 127
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-12-11 19:41:09 +00:00
Michael Tremer
93aa56a698 Start Core Update 126
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-11-12 00:15:28 +00:00
Michael Tremer
7e2d7b9837 Start Core Update 125
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-10-18 14:28:33 +01:00
Arne Fitzenreiter
fd313a1ae6 Merge branch 'master' into next 2018-08-29 07:44:59 +02:00
Michael Tremer
264f34546f Start Core Update 124
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-16 12:47:06 +01:00
Arne Fitzenreiter
1ac0d5c598 Merge branch 'aarch64' into next
Conflicts:
	config/rootfiles/core/121/filelists/acpid
	config/rootfiles/core/121/filelists/apache2
	config/rootfiles/core/121/filelists/apr
	config/rootfiles/core/121/filelists/aprutil
	config/rootfiles/core/121/filelists/armv5tel/files
	config/rootfiles/core/121/filelists/armv5tel/linux-initrd-kirkwood
	config/rootfiles/core/121/filelists/armv5tel/linux-initrd-multi
	config/rootfiles/core/121/filelists/armv5tel/linux-kirkwood
	config/rootfiles/core/121/filelists/armv5tel/linux-multi
	config/rootfiles/core/121/filelists/armv5tel/rpi-firmware
	config/rootfiles/core/121/filelists/armv5tel/u-boot
	config/rootfiles/core/121/filelists/armv5tel/u-boot-kirkwood
	config/rootfiles/core/121/filelists/armv5tel/u-boot-mkimage
	config/rootfiles/core/121/filelists/beep
	config/rootfiles/core/121/filelists/cmake
	config/rootfiles/core/121/filelists/crda
	config/rootfiles/core/121/filelists/dhcp
	config/rootfiles/core/121/filelists/flex
	config/rootfiles/core/121/filelists/i586/grub
	config/rootfiles/core/121/filelists/i586/intel-microcode
	config/rootfiles/core/121/filelists/i586/linux
	config/rootfiles/core/121/filelists/i586/linux-initrd
	config/rootfiles/core/121/filelists/iw
	config/rootfiles/core/121/filelists/jwhois
	config/rootfiles/core/121/filelists/libidn
	config/rootfiles/core/121/filelists/multipath-tools
	config/rootfiles/core/121/filelists/pcre
	config/rootfiles/core/121/filelists/tar
	config/rootfiles/core/121/filelists/unbound
	config/rootfiles/core/121/filelists/wget
	config/rootfiles/core/121/filelists/x86_64/grub
	config/rootfiles/core/121/filelists/x86_64/intel-microcode
	config/rootfiles/core/121/filelists/x86_64/linux
	config/rootfiles/core/121/filelists/x86_64/linux-initrd
	config/rootfiles/core/122/filelists/aarch64/files
	config/rootfiles/core/122/filelists/acpid
	config/rootfiles/core/122/filelists/apache2
	config/rootfiles/core/122/filelists/apr
	config/rootfiles/core/122/filelists/aprutil
	config/rootfiles/core/122/filelists/armv5tel/linux-initrd-kirkwood
	config/rootfiles/core/122/filelists/armv5tel/linux-initrd-multi
	config/rootfiles/core/122/filelists/armv5tel/linux-kirkwood
	config/rootfiles/core/122/filelists/armv5tel/linux-multi
	config/rootfiles/core/122/filelists/armv5tel/rpi-firmware
	config/rootfiles/core/122/filelists/armv5tel/u-boot
	config/rootfiles/core/122/filelists/armv5tel/u-boot-kirkwood
	config/rootfiles/core/122/filelists/armv5tel/u-boot-mkimage
	config/rootfiles/core/122/filelists/beep
	config/rootfiles/core/122/filelists/cmake
	config/rootfiles/core/122/filelists/crda
	config/rootfiles/core/122/filelists/dhcp
	config/rootfiles/core/122/filelists/flex
	config/rootfiles/core/122/filelists/i586/grub
	config/rootfiles/core/122/filelists/i586/intel-microcode
	config/rootfiles/core/122/filelists/i586/linux
	config/rootfiles/core/122/filelists/i586/linux-initrd
	config/rootfiles/core/122/filelists/iw
	config/rootfiles/core/122/filelists/jwhois
	config/rootfiles/core/122/filelists/libidn
	config/rootfiles/core/122/filelists/multipath-tools
	config/rootfiles/core/122/filelists/pcre
	config/rootfiles/core/122/filelists/tar
	config/rootfiles/core/122/filelists/unbound
	config/rootfiles/core/122/filelists/wget
	config/rootfiles/core/122/filelists/x86_64/grub
	config/rootfiles/core/122/filelists/x86_64/intel-microcode
	config/rootfiles/core/122/filelists/x86_64/linux
	config/rootfiles/core/122/filelists/x86_64/linux-initrd
	config/rootfiles/core/123/filelists/unbound
	config/rootfiles/oldcore/121/filelists/acpid
	config/rootfiles/oldcore/121/filelists/apache2
	config/rootfiles/oldcore/121/filelists/apr
	config/rootfiles/oldcore/121/filelists/aprutil
	config/rootfiles/oldcore/121/filelists/armv5tel/files
	config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-kirkwood
	config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-multi
	config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-rpi
	config/rootfiles/oldcore/121/filelists/armv5tel/linux-kirkwood
	config/rootfiles/oldcore/121/filelists/armv5tel/linux-multi
	config/rootfiles/oldcore/121/filelists/armv5tel/linux-rpi
	config/rootfiles/oldcore/121/filelists/armv5tel/rpi-firmware
	config/rootfiles/oldcore/121/filelists/armv5tel/u-boot
	config/rootfiles/oldcore/121/filelists/armv5tel/u-boot-kirkwood
	config/rootfiles/oldcore/121/filelists/armv5tel/u-boot-mkimage
	config/rootfiles/oldcore/121/filelists/beep
	config/rootfiles/oldcore/121/filelists/cmake
	config/rootfiles/oldcore/121/filelists/crda
	config/rootfiles/oldcore/121/filelists/dhcp
	config/rootfiles/oldcore/121/filelists/flex
	config/rootfiles/oldcore/121/filelists/i586/grub
	config/rootfiles/oldcore/121/filelists/i586/intel-microcode
	config/rootfiles/oldcore/121/filelists/i586/linux
	config/rootfiles/oldcore/121/filelists/i586/linux-initrd
	config/rootfiles/oldcore/121/filelists/iw
	config/rootfiles/oldcore/121/filelists/jwhois
	config/rootfiles/oldcore/121/filelists/libidn
	config/rootfiles/oldcore/121/filelists/multipath-tools
	config/rootfiles/oldcore/121/filelists/pcre
	config/rootfiles/oldcore/121/filelists/tar
	config/rootfiles/oldcore/121/filelists/wget
	config/rootfiles/oldcore/121/filelists/x86_64/grub
	config/rootfiles/oldcore/121/filelists/x86_64/intel-microcode
	config/rootfiles/oldcore/121/filelists/x86_64/linux
	config/rootfiles/oldcore/121/filelists/x86_64/linux-initrd
	make.sh
2018-07-03 11:52:05 +01:00
Michael Tremer
28aacf565b Start Core Update 123
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-06-18 16:43:04 +01:00
Arne Fitzenreiter
0d2cbbab85 Merge branch 'kernel-4.14' into next 2018-05-05 09:14:42 +02:00
Peter Müller
2a20456f7d Start Core Update 121
Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-04-27 11:04:21 +01:00
Arne Fitzenreiter
36600cef36 Merge branch 'core119' into next 2018-03-30 09:35:28 +02:00
Michael Tremer
cb8a6bf5a4 Start Core Update 120
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-02-21 12:20:57 +00:00
Michael Tremer
338087530c Start Core Update 119
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-02-12 11:22:58 +00:00
Michael Tremer
1068c3e755 Start Core Update 118
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-12-14 15:55:54 +00:00
Michael Tremer
bb3272dad3 Start Core Update 117
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-11-07 16:14:36 +00:00
Michael Tremer
cd8a7fc1eb Start Core Update 116
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-10-23 16:24:10 +01:00
Arne Fitzenreiter
fcd8ab4c23 Merge branch 'master' into core115 2017-10-18 21:20:23 +02:00
Arne Fitzenreiter
c42237247a start core115
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2017-09-24 15:51:12 +02:00
Michael Tremer
05e7808cd6 Start Core Update 114
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-08-21 12:21:14 +01:00
Michael Tremer
12b0bd949a Start Core Update 113
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-08-15 11:44:50 +01:00
Michael Tremer
9b5302d2ce Archive Core Updates 110 + 111
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-07-01 12:45:16 +01:00
Arne Fitzenreiter
af7e2f072f Merge branch 'next' 2017-04-03 23:04:59 +02:00
Michael Tremer
63de1e482a Start Core Update 110
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-02-27 15:00:46 +00:00
Arne Fitzenreiter
8bbcfa1152 Merge branch 'next' 2017-02-01 22:36:11 +01:00
Arne Fitzenreiter
7ba5691854 start core109 updater
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2016-12-22 20:39:38 +01:00
Michael Tremer
49750f72de Start Core Update 108
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-11-28 21:48:21 +00:00
Arne Fitzenreiter
38183e52dd start core107 updater
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2016-10-27 21:07:55 +02:00
Michael Tremer
59bddc7989 Start Core Update 106
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-09-26 20:25:22 +01:00
Michael Tremer
c4a1169ed9 Start Core Update 105
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-09-22 10:28:36 +01:00
Michael Tremer
b6c0145236 Start Core Update 104
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-06-16 09:24:22 +01:00
Arne Fitzenreiter
be700f1806 core103: start
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2016-05-06 15:32:01 +02:00
Arne Fitzenreiter
3af3a6c5ee core102: ship openssl and openssl updates
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2016-05-03 21:31:37 +02:00
Arne Fitzenreiter
c485f38c99 Merge remote-tracking branch 'origin/core100' into next 2016-04-19 22:04:24 +02:00
Arne Fitzenreiter
9a6be06535 core101: start update.
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2016-04-06 19:57:46 +02:00
Arne Fitzenreiter
4a6cfe51a1 Merge remote-tracking branch 'origin/master' into next
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2016-03-04 07:09:02 +01:00
Arne Fitzenreiter
802b916d10 Merge remote-tracking branch 'origin/master' into next
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

Conflicts:
	make.sh
2016-02-17 19:47:50 +01:00
Arne Fitzenreiter
35b24ff8a9 set core to 98 and move 97 to oldcore
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2016-01-28 22:10:11 +01:00
Michael Tremer
665f79926d Merge remote-tracking branch 'origin/master' into next 2016-01-23 00:39:19 +00:00
Michael Tremer
ea155e2d2b Move Core Update 96 to oldcore
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-12-22 11:13:03 +00:00
Arne Fitzenreiter
74e5c32e19 Merge branch 'master' into next 2015-12-02 21:39:20 +01:00
Arne Fitzenreiter
cfac8f9476 start core96
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-11-11 14:49:02 +01:00
Arne Fitzenreiter
a14e8d0256 Merge remote-tracking branch 'origin/master' into next 2015-10-25 09:21:12 +01:00
Arne Fitzenreiter
159c9eb9b1 Merge remote-tracking branch 'origin/master' into next 2015-10-22 13:11:17 +02:00
Arne Fitzenreiter
16016ff2b0 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next 2015-09-28 18:42:57 +02:00