summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortnut <tnut at nutyx dot com>2011-06-02 13:54:32 +0200
committertnut <tnut at nutyx dot com>2011-06-02 13:54:32 +0200
commit933f20dc360e3373517071b1074bb9f34c9b4f9f (patch)
treee5216190cd2043f7901f06b40a8c113bb26da90b
parent65d13787df452d242ade28dd08b6ddacd90e219b (diff)
parent325216477978097ebfa0e2bffe5c32b82e320f6f (diff)
downloadnutyx-extra-87290a7b406991c4ed773b2b8f6a39f9b7175707.tar.gz
nutyx-extra-87290a7b406991c4ed773b2b8f6a39f9b7175707.tar.bz2
nutyx-extra-87290a7b406991c4ed773b2b8f6a39f9b7175707.tar.xz
nutyx-extra-87290a7b406991c4ed773b2b8f6a39f9b7175707.zip
Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxeNuTyX-pakxe
-rw-r--r--base/aaabasicfs/.footprint.i68615
-rw-r--r--base/aaabasicfs/.footprint.x86_6415
-rw-r--r--base/kernel-35/Pkgfile4
-rw-r--r--base/kernel/Pkgfile8
-rw-r--r--base/kernel/config12
-rw-r--r--kde/shared-desktop-ontologies/.md5sum.i6862
-rw-r--r--kde/shared-desktop-ontologies/.md5sum.x86_642
-rw-r--r--kde/shared-desktop-ontologies/Pkgfile4
8 files changed, 22 insertions, 40 deletions
diff --git a/base/aaabasicfs/.footprint.i686 b/base/aaabasicfs/.footprint.i686
index 937942351..4f652f69e 100644
--- a/base/aaabasicfs/.footprint.i686
+++ b/base/aaabasicfs/.footprint.i686
@@ -139,35 +139,26 @@ drwxr-x--- root/root root/
-rw-r--r-- root/root root/.bashrc
lrwxrwxrwx root/root root/.xinitrc -> ../etc/skel/.xinitrc
lrwxrwxrwx root/root root/20-keyboard.conf -> ../etc/X11/xorg.conf.d/20-keyboard.conf
-lrwxrwxrwx root/root root/X.sh -> ../etc/profile.d/X.sh
lrwxrwxrwx root/root root/bashrc -> ../etc/bashrc
drwxr-xr-x root/root root/bin/
-rwxr-xr-x root/root root/bin/nu
-lrwxrwxrwx root/root root/clock -> ../etc/sysconfig/clock
-lrwxrwxrwx root/root root/console -> ../etc/sysconfig/console
-lrwxrwxrwx root/root root/dircolors.sh -> ../etc/profile.d/dircolors.sh
-lrwxrwxrwx root/root root/extrapaths.sh -> ../etc/profile.d/extrapaths.sh
lrwxrwxrwx root/root root/fstab -> ../etc/fstab
lrwxrwxrwx root/root root/hosts -> ../etc/hosts
lrwxrwxrwx root/root root/hosts.allow -> ../etc/hosts.allow
lrwxrwxrwx root/root root/hosts.deny -> ../etc/hosts.deny
-lrwxrwxrwx root/root root/i18n.sh -> ../etc/profile.d/i18n.sh
lrwxrwxrwx root/root root/inittab -> ../etc/inittab
lrwxrwxrwx root/root root/inputrc -> ../etc/inputrc
-lrwxrwxrwx root/root root/jdk.sh -> ../etc/profile.d/jdk.sh
lrwxrwxrwx root/root root/menu.lst -> ../boot/grub/menu.lst
-lrwxrwxrwx root/root root/modprobe.conf -> ../etc/modprobe.d/modprobe.conf
-lrwxrwxrwx root/root root/modules -> ../etc/sysconfig/modules
-lrwxrwxrwx root/root root/network -> ../etc/sysconfig/network
+lrwxrwxrwx root/root root/modprobe.d -> ../etc/modprobe.d
lrwxrwxrwx root/root root/pkg-get.conf -> ../etc/pkg-get.conf
lrwxrwxrwx root/root root/pkgadd.conf -> ../etc/pkgadd.conf
lrwxrwxrwx root/root root/pkgmk.conf -> ../etc/pkgmk.conf
lrwxrwxrwx root/root root/profile -> ../etc/profile
+lrwxrwxrwx root/root root/profile.d -> ../etc/profile.d
lrwxrwxrwx root/root root/prt-get.conf -> ../etc/prt-get.conf
-lrwxrwxrwx root/root root/readline.sh -> ../etc/profile.d/readline.sh
lrwxrwxrwx root/root root/resolv.conf -> ../etc/resolv.conf
lrwxrwxrwx root/root root/shells -> ../etc/shells
-lrwxrwxrwx root/root root/unmask.sh -> ../etc/profile.d/unmask.sh
+lrwxrwxrwx root/root root/sysconfig -> ../etc/sysconfig
lrwxrwxrwx root/root root/useradd -> ../etc/default/useradd
drwxr-xr-x root/root run/
-rw-rw-r-- root/utmp run/utmp (EMPTY)
diff --git a/base/aaabasicfs/.footprint.x86_64 b/base/aaabasicfs/.footprint.x86_64
index 783d2f346..c9ba9ca43 100644
--- a/base/aaabasicfs/.footprint.x86_64
+++ b/base/aaabasicfs/.footprint.x86_64
@@ -140,35 +140,26 @@ drwxr-x--- root/root root/
-rw-r--r-- root/root root/.bashrc
lrwxrwxrwx root/root root/.xinitrc -> ../etc/skel/.xinitrc
lrwxrwxrwx root/root root/20-keyboard.conf -> ../etc/X11/xorg.conf.d/20-keyboard.conf
-lrwxrwxrwx root/root root/X.sh -> ../etc/profile.d/X.sh
lrwxrwxrwx root/root root/bashrc -> ../etc/bashrc
drwxr-xr-x root/root root/bin/
-rwxr-xr-x root/root root/bin/nu
-lrwxrwxrwx root/root root/clock -> ../etc/sysconfig/clock
-lrwxrwxrwx root/root root/console -> ../etc/sysconfig/console
-lrwxrwxrwx root/root root/dircolors.sh -> ../etc/profile.d/dircolors.sh
-lrwxrwxrwx root/root root/extrapaths.sh -> ../etc/profile.d/extrapaths.sh
lrwxrwxrwx root/root root/fstab -> ../etc/fstab
lrwxrwxrwx root/root root/hosts -> ../etc/hosts
lrwxrwxrwx root/root root/hosts.allow -> ../etc/hosts.allow
lrwxrwxrwx root/root root/hosts.deny -> ../etc/hosts.deny
-lrwxrwxrwx root/root root/i18n.sh -> ../etc/profile.d/i18n.sh
lrwxrwxrwx root/root root/inittab -> ../etc/inittab
lrwxrwxrwx root/root root/inputrc -> ../etc/inputrc
-lrwxrwxrwx root/root root/jdk.sh -> ../etc/profile.d/jdk.sh
lrwxrwxrwx root/root root/menu.lst -> ../boot/grub/menu.lst
-lrwxrwxrwx root/root root/modprobe.conf -> ../etc/modprobe.d/modprobe.conf
-lrwxrwxrwx root/root root/modules -> ../etc/sysconfig/modules
-lrwxrwxrwx root/root root/network -> ../etc/sysconfig/network
+lrwxrwxrwx root/root root/modprobe.d -> ../etc/modprobe.d
lrwxrwxrwx root/root root/pkg-get.conf -> ../etc/pkg-get.conf
lrwxrwxrwx root/root root/pkgadd.conf -> ../etc/pkgadd.conf
lrwxrwxrwx root/root root/pkgmk.conf -> ../etc/pkgmk.conf
lrwxrwxrwx root/root root/profile -> ../etc/profile
+lrwxrwxrwx root/root root/profile.d -> ../etc/profile.d
lrwxrwxrwx root/root root/prt-get.conf -> ../etc/prt-get.conf
-lrwxrwxrwx root/root root/readline.sh -> ../etc/profile.d/readline.sh
lrwxrwxrwx root/root root/resolv.conf -> ../etc/resolv.conf
lrwxrwxrwx root/root root/shells -> ../etc/shells
-lrwxrwxrwx root/root root/unmask.sh -> ../etc/profile.d/unmask.sh
+lrwxrwxrwx root/root root/sysconfig -> ../etc/sysconfig
lrwxrwxrwx root/root root/useradd -> ../etc/default/useradd
drwxr-xr-x root/root run/
-rw-rw-r-- root/utmp run/utmp (EMPTY)
diff --git a/base/kernel-35/Pkgfile b/base/kernel-35/Pkgfile
index 15768d247..2a7423697 100644
--- a/base/kernel-35/Pkgfile
+++ b/base/kernel-35/Pkgfile
@@ -6,14 +6,14 @@
name=kernel-35
version=2.6.35.13
_BaseVersion=2.6.35
-release=1
+release=2
PKGMK_NO_STRIP="yes"
PKGMK_IGNORE_FOOTPRINT="yes"
PKGMK_IGNORE_MD5SUM="yes"
SCRIPT_VERSION="pakxe"
INITRDBASE="nutyx-initrd"
_extra=30052011
-_tools=30052011
+_tools=02062011
source=(http://www.kernel.org/pub/linux/kernel/v2.6/linux-${_BaseVersion}.tar.bz2 config_64 config\
http://www.kernel.org/pub/linux/kernel/v2.6/longterm/v${_BaseVersion}/patch-$version.bz2 \
http://nutyx.meticul.eu/install-${SCRIPT_VERSION}.ash \
diff --git a/base/kernel/Pkgfile b/base/kernel/Pkgfile
index 9213ea5b5..daf22c8ae 100644
--- a/base/kernel/Pkgfile
+++ b/base/kernel/Pkgfile
@@ -6,14 +6,14 @@
name=kernel
version=2.6.38.7
_BaseVersion=2.6.38
-release=2
+release=3
PKGMK_NO_STRIP="yes"
PKGMK_IGNORE_FOOTPRINT="yes"
PKGMK_IGNORE_MD5SUM="yes"
SCRIPT_VERSION="pakxe"
INITRDBASE="nutyx-initrd"
-_extra=23052011
-_tools=26052011
+_extra=30052011
+_tools=02062011
source=(http://www.kernel.org/pub/linux/kernel/v2.6/linux-${_BaseVersion}.tar.bz2 config_64 config\
http://www.kernel.org/pub/linux/kernel/v2.6/patch-$version.bz2 \
http://nutyx.meticul.eu/install-${SCRIPT_VERSION}.ash \
@@ -43,7 +43,7 @@ if [ -f ../patch-$version.bz2 ]; then
bzip2 -d -c ../patch-$version.bz2 | patch -Np1
fi
sed -i "s/EXTRAVERSION = .*/EXTRAVERSION =/" Makefile
-make menuconfig
+# make menuconfig
case `uname -m` in
x86_64)
cp .config `prt-get printf %p --filter=$name`/$name/config_64;;
diff --git a/base/kernel/config b/base/kernel/config
index d9c93222d..aed5baebe 100644
--- a/base/kernel/config
+++ b/base/kernel/config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux/i386 2.6.38 Kernel Configuration
-# Thu May 26 17:52:32 2011
+# Mon May 30 13:30:07 2011
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -472,14 +472,14 @@ CONFIG_CPU_FREQ_TABLE=m
CONFIG_CPU_FREQ_STAT=m
# CONFIG_CPU_FREQ_STAT_DETAILS is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=m
+CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
CONFIG_CPU_FREQ_GOV_ONDEMAND=m
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
#
# CPUFreq processor drivers
diff --git a/kde/shared-desktop-ontologies/.md5sum.i686 b/kde/shared-desktop-ontologies/.md5sum.i686
index 9565d71c2..41bc3b006 100644
--- a/kde/shared-desktop-ontologies/.md5sum.i686
+++ b/kde/shared-desktop-ontologies/.md5sum.i686
@@ -1 +1 @@
-2651122ac27de95e91973ed6b88ccf94 shared-desktop-ontologies-0.6.0.tar.bz2
+cf1e020f72f5e695cfe8711766546ee6 shared-desktop-ontologies-0.7.0.tar.bz2
diff --git a/kde/shared-desktop-ontologies/.md5sum.x86_64 b/kde/shared-desktop-ontologies/.md5sum.x86_64
index 9565d71c2..41bc3b006 100644
--- a/kde/shared-desktop-ontologies/.md5sum.x86_64
+++ b/kde/shared-desktop-ontologies/.md5sum.x86_64
@@ -1 +1 @@
-2651122ac27de95e91973ed6b88ccf94 shared-desktop-ontologies-0.6.0.tar.bz2
+cf1e020f72f5e695cfe8711766546ee6 shared-desktop-ontologies-0.7.0.tar.bz2
diff --git a/kde/shared-desktop-ontologies/Pkgfile b/kde/shared-desktop-ontologies/Pkgfile
index a12a48606..d2693a43a 100644
--- a/kde/shared-desktop-ontologies/Pkgfile
+++ b/kde/shared-desktop-ontologies/Pkgfile
@@ -6,9 +6,9 @@
# Run on: qt
name=shared-desktop-ontologies
-version=0.6.0
+version=0.7.0
release=1
-source=(http://downloads.sourceforge.net/project/oscaf/$name/0.6/$name-$version.tar.bz2)
+source=(http://downloads.sourceforge.net/project/oscaf/$name/0.7/$name-$version.tar.bz2)
build() {
cd $name-$version