[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, kernel-update, updated. 71af1843723e08a23864af50de27438bde6595f0
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, kernel-update has been updated via 71af1843723e08a23864af50de27438bde6595f0 (commit) via 1edfc9c33d798a05e77e99c3f3031b3de6db759a (commit) via 8f17b54f9686052a7bc5708ad9eb96fe99463363 (commit) via 9c166bf2a6a3d8d8df1ad29b6e631671cc33536d (commit) via 9f82cdb1f8a804b52ab28f6dfb42b08b90e1197c (commit) via 75c6309704bb258491ccf3610b15ed7d59ebbced (commit) via de887913ee5c688b8500ec7f6dbe376ce436d492 (commit) from ab378a41994392ffdbd7e169d15a94dff59aa175 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 71af1843723e08a23864af50de27438bde6595f0 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat May 5 11:04:25 2012 +0200
kernel: updated omap kernel to 2.6.40.30 aka 3.0.30.
commit 1edfc9c33d798a05e77e99c3f3031b3de6db759a Merge: 75c6309 8f17b54 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri May 4 11:58:41 2012 +0200
Merge remote-tracking branch 'origin/next' into kernel-update
commit 75c6309704bb258491ccf3610b15ed7d59ebbced Merge: ab378a4 de88791 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Apr 10 20:30:23 2012 +0200
Merge remote-tracking branch 'origin/master' into kernel-update
-----------------------------------------------------------------------
Summary of changes: config/kernel/kernel.config.armv5tel-ipfire-omap | 103 +++++++++++----------- config/rootfiles/common/armv5tel/linux-omap | 6 +- config/rootfiles/common/openssl | 2 +- html/cgi-bin/samba.cgi | 4 +- lfs/linux3 | 11 ++- lfs/openssl | 4 +- lfs/samba | 8 +- src/patches/linux-2.6.40-pandaboard-memcpy.patch | 21 +++++ 8 files changed, 91 insertions(+), 68 deletions(-) create mode 100644 src/patches/linux-2.6.40-pandaboard-memcpy.patch
Difference in files: diff --git a/config/kernel/kernel.config.armv5tel-ipfire-omap b/config/kernel/kernel.config.armv5tel-ipfire-omap index 628d0db..5680114 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-omap +++ b/config/kernel/kernel.config.armv5tel-ipfire-omap @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/arm 2.6.40.24 Kernel Configuration +# Linux/arm 2.6.40.26-ipfire-omap Kernel Configuration # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -276,7 +276,7 @@ CONFIG_OMAP_DEBUG_LEDS=y # CONFIG_OMAP_SMARTREFLEX is not set CONFIG_OMAP_RESET_CLOCKS=y CONFIG_OMAP_MUX=y -CONFIG_OMAP_MUX_DEBUG=y +# CONFIG_OMAP_MUX_DEBUG is not set CONFIG_OMAP_MUX_WARNINGS=y CONFIG_OMAP_MCBSP=y # CONFIG_OMAP_MBOX_FWK is not set @@ -387,18 +387,18 @@ CONFIG_CACHE_L2X0=y CONFIG_ARM_L1_CACHE_SHIFT=5 CONFIG_ARM_DMA_MEM_BUFFERABLE=y CONFIG_ARM_ERRATA_411920=y -# CONFIG_ARM_ERRATA_430973 is not set -# CONFIG_ARM_ERRATA_458693 is not set -# CONFIG_ARM_ERRATA_460075 is not set +CONFIG_ARM_ERRATA_430973=y +CONFIG_ARM_ERRATA_458693=y +CONFIG_ARM_ERRATA_460075=y # CONFIG_ARM_ERRATA_742230 is not set -# CONFIG_ARM_ERRATA_742231 is not set +CONFIG_ARM_ERRATA_742231=y CONFIG_PL310_ERRATA_588369=y CONFIG_ARM_ERRATA_720789=y CONFIG_PL310_ERRATA_727915=y -# CONFIG_ARM_ERRATA_743622 is not set +CONFIG_ARM_ERRATA_743622=y # CONFIG_ARM_ERRATA_751472 is not set -# CONFIG_ARM_ERRATA_754322 is not set -# CONFIG_ARM_ERRATA_754327 is not set +CONFIG_ARM_ERRATA_754322=y +CONFIG_ARM_ERRATA_754327=y CONFIG_ARM_GIC=y
# @@ -407,7 +407,7 @@ CONFIG_ARM_GIC=y # CONFIG_PCI_SYSCALL is not set # CONFIG_ARCH_SUPPORTS_MSI is not set # CONFIG_PCCARD is not set -# CONFIG_ARM_ERRATA_764369 is not set +CONFIG_ARM_ERRATA_764369=y CONFIG_PL310_ERRATA_769419=y
# @@ -438,7 +438,8 @@ CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set CONFIG_HAVE_ARCH_PFN_VALID=y -# CONFIG_HIGHMEM is not set +CONFIG_HIGHMEM=y +CONFIG_HIGHPTE=y CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y CONFIG_FLATMEM=y @@ -449,6 +450,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_COMPACTION is not set # CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_ZONE_DMA_FLAG=0 +CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y CONFIG_KSM=y CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 @@ -1821,7 +1823,6 @@ CONFIG_IPMI_POWEROFF=m CONFIG_HW_RANDOM=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_OMAP=m -CONFIG_NVRAM=m # CONFIG_R3964 is not set # CONFIG_RAW_DRIVER is not set # CONFIG_TCG_TPM is not set @@ -3133,33 +3134,32 @@ CONFIG_RTC_INTF_SYSFS=y CONFIG_RTC_INTF_PROC=y CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set -CONFIG_RTC_DRV_TEST=m +# CONFIG_RTC_DRV_TEST is not set
# # I2C RTC drivers # -CONFIG_RTC_DRV_DS1307=m -CONFIG_RTC_DRV_DS1374=m -CONFIG_RTC_DRV_DS1672=m -CONFIG_RTC_DRV_DS3232=m -CONFIG_RTC_DRV_MAX6900=m -CONFIG_RTC_DRV_RS5C372=m -CONFIG_RTC_DRV_ISL1208=m -CONFIG_RTC_DRV_ISL12022=m -CONFIG_RTC_DRV_X1205=m -CONFIG_RTC_DRV_PCF8563=m -CONFIG_RTC_DRV_PCF8583=m -CONFIG_RTC_DRV_M41T80=m -# CONFIG_RTC_DRV_M41T80_WDT is not set -CONFIG_RTC_DRV_BQ32K=m -# CONFIG_RTC_DRV_TWL92330 is not set -CONFIG_RTC_DRV_TWL4030=m -CONFIG_RTC_DRV_S35390A=m -CONFIG_RTC_DRV_FM3130=m -CONFIG_RTC_DRV_RX8581=m -CONFIG_RTC_DRV_RX8025=m -CONFIG_RTC_DRV_EM3027=m -CONFIG_RTC_DRV_RV3029C2=m +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1374 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_DS3232 is not set +# CONFIG_RTC_DRV_MAX6900 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_ISL12022 is not set +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_M41T80 is not set +CONFIG_RTC_DRV_BQ32K=y +CONFIG_RTC_DRV_TWL92330=y +CONFIG_RTC_DRV_TWL4030=y +# CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_FM3130 is not set +# CONFIG_RTC_DRV_RX8581 is not set +# CONFIG_RTC_DRV_RX8025 is not set +# CONFIG_RTC_DRV_EM3027 is not set +# CONFIG_RTC_DRV_RV3029C2 is not set
# # SPI RTC drivers @@ -3168,20 +3168,20 @@ CONFIG_RTC_DRV_RV3029C2=m # # Platform RTC drivers # -CONFIG_RTC_DRV_CMOS=m -CONFIG_RTC_DRV_DS1286=m -CONFIG_RTC_DRV_DS1511=m -CONFIG_RTC_DRV_DS1553=m -CONFIG_RTC_DRV_DS1742=m -CONFIG_RTC_DRV_STK17TA8=m -CONFIG_RTC_DRV_M48T86=m -CONFIG_RTC_DRV_M48T35=m -CONFIG_RTC_DRV_M48T59=m -CONFIG_RTC_DRV_MSM6242=m -CONFIG_RTC_DRV_BQ4802=m -CONFIG_RTC_DRV_RP5C01=m -CONFIG_RTC_DRV_V3020=m -CONFIG_RTC_DRV_PCF50633=m +# CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_DS1286 is not set +# CONFIG_RTC_DRV_DS1511 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T35 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_MSM6242 is not set +CONFIG_RTC_DRV_BQ4802=y +# CONFIG_RTC_DRV_RP5C01 is not set +# CONFIG_RTC_DRV_V3020 is not set +# CONFIG_RTC_DRV_PCF50633 is not set
# # on-CPU RTC drivers @@ -3199,8 +3199,8 @@ CONFIG_DMA_ENGINE=y # # DMA Clients # -# CONFIG_NET_DMA is not set -# CONFIG_ASYNC_TX_DMA is not set +CONFIG_NET_DMA=y +CONFIG_ASYNC_TX_DMA=y # CONFIG_DMATEST is not set # CONFIG_AUXDISPLAY is not set CONFIG_UIO=m @@ -3551,6 +3551,7 @@ CONFIG_TIMER_STATS=y # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_HIGHMEM is not set CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_INFO is not set # CONFIG_DEBUG_VM is not set diff --git a/config/rootfiles/common/armv5tel/linux-omap b/config/rootfiles/common/armv5tel/linux-omap index 15bcb6c..8130a43 100644 --- a/config/rootfiles/common/armv5tel/linux-omap +++ b/config/rootfiles/common/armv5tel/linux-omap @@ -1,5 +1,5 @@ boot/uInit-ipfire-omap boot/uImage-ipfire-omap -boot/System.map-2.6.40.24-ipfire-omap -boot/config-2.6.40.24-ipfire-omap -lib/modules/2.6.40.24-ipfire-omap +boot/System.map-2.6.40.30-ipfire-omap +boot/config-2.6.40.30-ipfire-omap +lib/modules/2.6.40.30-ipfire-omap diff --git a/config/rootfiles/common/openssl b/config/rootfiles/common/openssl index bc1ac49..02e4c1c 100644 --- a/config/rootfiles/common/openssl +++ b/config/rootfiles/common/openssl @@ -1116,7 +1116,6 @@ usr/lib/libssl.so.0.9.8 #usr/share/man/man3/dsa.3 #usr/share/man/man3/ecdsa.3 #usr/share/man/man3/engine.3 -#usr/share/man/man3/err.3 #usr/share/man/man3/evp.3 #usr/share/man/man3/hmac.3 #usr/share/man/man3/i2d_ASN1_OBJECT.3 @@ -1164,6 +1163,7 @@ usr/lib/libssl.so.0.9.8 #usr/share/man/man3/md5.3 #usr/share/man/man3/mdc2.3 #usr/share/man/man3/pem.3 +#usr/share/man/man3/rand.3 #usr/share/man/man3/rc4.3 #usr/share/man/man3/ripemd.3 #usr/share/man/man3/rsa.3 diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 57970db..27856ca 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2005-2010 IPFire Team # +# Copyright (C) 2005-2012 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -77,7 +77,7 @@ my %servicenames = ('SMB Daemon' => 'smbd','NetBIOS Nameserver' => 'nmbd');
$sambasettings{'WORKGRP'} = 'homeip.net'; $sambasettings{'NETBIOSNAME'} = 'IPFire'; -$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.9'; +$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.x'; $sambasettings{'INTERFACES'} = ''; $sambasettings{'SECURITY'} = 'share'; $sambasettings{'OSLEVEL'} = '33'; diff --git a/lfs/linux3 b/lfs/linux3 index e4a4cc7..09e5a0e 100644 --- a/lfs/linux3 +++ b/lfs/linux3 @@ -24,14 +24,14 @@
include Config
-PATCHLEVEL = .24 -VER = 2.6.40.24 +PATCHLEVEL = .30 +VER = 2.6.40.30
-XVERS = 3.0.24 +XVERS = 3.0.30 XVERSION = 2 XPATCHLEVEL = 6 XSUBLEVEL = 40 -XEXTRAVERSION = .24 +XEXTRAVERSION = .30
THISAPP = linux-$(VER) DL_FILE = linux-$(XVERS).tar.bz2 @@ -86,7 +86,7 @@ patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 reiser4-for-2.6.32.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2 xen-patches-2.6.32-2f.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2f.tar.bz2
-$(DL_FILE)_MD5 = 3bebfdf614f3139202c5497b40953920 +$(DL_FILE)_MD5 = fbd04e3f1060dc71ebbf0cb644ae1573 patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138 reiser4-for-2.6.32.patch.bz2_MD5 = 3246397973d9271eb8e6d7c97c5d2d91 xen-patches-2.6.32-2f.tar.bz2_MD5 = b59d6f89e11accb9d40354418e13f31b @@ -189,6 +189,7 @@ ifeq "$(KCFG)" "-omap" cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.40-pandaboard-i2c-fix.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.40-pandaboard-reboot.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.40-pandaboard-rtc-twl-irq.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.40-pandaboard-memcpy.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.x-smsc95xx-add_mac_addr_param.patch endif
diff --git a/lfs/openssl b/lfs/openssl index 9d559e1..c58c048 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -24,7 +24,7 @@
include Config
-VER = 0.9.8u +VER = 0.9.8w
THISAPP = openssl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = cb41e94f762ed63e41d1cca2b8430ede +$(DL_FILE)_MD5 = 4ceb7d570e42c094b360cc7b8e848a0b
install : $(TARGET)
diff --git a/lfs/samba b/lfs/samba index 781a342..e27ee08 100644 --- a/lfs/samba +++ b/lfs/samba @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2012 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 3.5.13 +VER = 3.5.15
THISAPP = samba-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 38 +PAK_VER = 40
DEPS = "cups"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ceb91e31218e337ae8d47b35f03518ca +$(DL_FILE)_MD5 = 2d72c044bdfd854ee2ab736326da3afd
install : $(TARGET)
diff --git a/src/patches/linux-2.6.40-pandaboard-memcpy.patch b/src/patches/linux-2.6.40-pandaboard-memcpy.patch new file mode 100644 index 0000000..69e5e6e --- /dev/null +++ b/src/patches/linux-2.6.40-pandaboard-memcpy.patch @@ -0,0 +1,21 @@ +arch/arm/lib/uaccess_with_memcpy.c: In function 'pin_page_for_write': +arch/arm/lib/uaccess_with_memcpy.c:45: error: implicit declaration of function 'kmap_atomic' +arch/arm/lib/uaccess_with_memcpy.c:48: error: implicit declaration of function 'kunmap_atomic' +make[2]: *** [arch/arm/lib/uaccess_with_memcpy.o] Error 1 + +Signed-off-by: Paul Gortmaker <paul.gortmaker at windriver.com> + +diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c +index 8b9b136..66945a6 100644 +--- a/arch/arm/lib/uaccess_with_memcpy.c ++++ b/arch/arm/lib/uaccess_with_memcpy.c +@@ -12,6 +12,7 @@ + #include <linux/kernel.h> + #include <linux/ctype.h> + #include <linux/uaccess.h> ++#include <linux/highmem.h> + #include <linux/rwsem.h> + #include <linux/mm.h> + #include <linux/sched.h> +-- +1.7.6
hooks/post-receive -- IPFire 2.x development tree
-
git＠ipfire.org