diff options
| author | orchidman <lesibel@free.fr> | 2011-12-26 13:56:20 +0100 |
|---|---|---|
| committer | orchidman <lesibel@free.fr> | 2011-12-26 13:56:20 +0100 |
| commit | 344712c5f2e307ad043bd6fc2e0e7c358d7a5e20 (patch) | |
| tree | 890aafc4ba913e3626ee053c53fd2affcc17dd2c /base | |
| parent | a478070f3c2262ea998d09fccd92407a1b69c802 (diff) | |
| parent | 202107eaff0927a6dedf5396b92f9bdbbc061ef9 (diff) | |
| download | nutyx-extra-344712c5f2e307ad043bd6fc2e0e7c358d7a5e20.tar.gz nutyx-extra-344712c5f2e307ad043bd6fc2e0e7c358d7a5e20.tar.bz2 nutyx-extra-344712c5f2e307ad043bd6fc2e0e7c358d7a5e20.tar.xz nutyx-extra-344712c5f2e307ad043bd6fc2e0e7c358d7a5e20.zip | |
Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe
Diffstat (limited to 'base')
| -rw-r--r-- | base/kernel/Pkgfile | 4 | ||||
| -rw-r--r-- | base/kernel/config | 8 | ||||
| -rw-r--r-- | base/kernel/config_64 | 8 | ||||
| -rwxr-xr-x | base/vim/Pkgfile | 4 |
4 files changed, 16 insertions, 8 deletions
diff --git a/base/kernel/Pkgfile b/base/kernel/Pkgfile index 0cb354c1b..4e99009d3 100644 --- a/base/kernel/Pkgfile +++ b/base/kernel/Pkgfile @@ -6,7 +6,7 @@ name=kernel version=3.1.6 _BaseVersion=3.1 -release=1 +release=2 PKGMK_NO_STRIP="yes" PKGMK_IGNORE_FOOTPRINT="yes" PKGMK_IGNORE_MD5SUM="yes" @@ -140,7 +140,7 @@ case `uname -m` in esac ln -sf kernel-$version $PKG/boot/kernel cd $PKG/lib/modules/${version}/ -#rm {build,source} +rm {build,source} ln -sv /usr/src/linux-${_BaseVersion} build ln -sv /usr/src/linux-${_BaseVersion} source diff --git a/base/kernel/config b/base/kernel/config index c1b099dc7..25db91fb6 100644 --- a/base/kernel/config +++ b/base/kernel/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.1.3 Kernel Configuration +# Linux/i386 3.1.6 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -651,7 +651,10 @@ CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_ROUTE_MULTIPATH=y CONFIG_IP_ROUTE_VERBOSE=y CONFIG_IP_ROUTE_CLASSID=y -# CONFIG_IP_PNP is not set +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y CONFIG_NET_IPIP=m CONFIG_NET_IPGRE_DEMUX=m CONFIG_NET_IPGRE=m @@ -5277,6 +5280,7 @@ CONFIG_NFS_V4_1=y CONFIG_PNFS_FILE_LAYOUT=y CONFIG_PNFS_BLOCK=m CONFIG_PNFS_OBJLAYOUT=m +CONFIG_ROOT_NFS=y CONFIG_NFS_USE_LEGACY_DNS=y CONFIG_NFS_USE_NEW_IDMAPPER=y CONFIG_NFSD=m diff --git a/base/kernel/config_64 b/base/kernel/config_64 index 15890961a..7c64f836e 100644 --- a/base/kernel/config_64 +++ b/base/kernel/config_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.1.3 Kernel Configuration +# Linux/x86_64 3.1.6 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -613,7 +613,10 @@ CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_ROUTE_MULTIPATH=y CONFIG_IP_ROUTE_VERBOSE=y CONFIG_IP_ROUTE_CLASSID=y -# CONFIG_IP_PNP is not set +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y CONFIG_NET_IPIP=m CONFIG_NET_IPGRE_DEMUX=m CONFIG_NET_IPGRE=m @@ -5225,6 +5228,7 @@ CONFIG_NFS_V4_1=y CONFIG_PNFS_FILE_LAYOUT=y CONFIG_PNFS_BLOCK=m CONFIG_PNFS_OBJLAYOUT=m +CONFIG_ROOT_NFS=y CONFIG_NFS_USE_LEGACY_DNS=y CONFIG_NFS_USE_NEW_IDMAPPER=y CONFIG_NFSD=m diff --git a/base/vim/Pkgfile b/base/vim/Pkgfile index 9601a92c4..f86b618a8 100755 --- a/base/vim/Pkgfile +++ b/base/vim/Pkgfile @@ -5,7 +5,7 @@ name=vim version=7.3 -release=1 +release=2 source=(ftp://ftp.vim.org/pub/vim/unix/vim-$version.tar.bz2\ vimrc) build () { @@ -13,7 +13,7 @@ cd $name${version/\./} echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h ./configure --prefix=/usr \ --enable-gui=no --with-x=no \ - --enable-multibyte + --enable-multibyte --disable-gpm make make DESTDIR=$PKG install |