summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/kexecboot/files/.mtn2git_empty (renamed from packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/.mtn2git_empty)0
-rw-r--r--packages/kexecboot/files/rootdelay.patch11
-rw-r--r--packages/kexecboot/initramfs-kexecboot-image.bb2
-rw-r--r--packages/kexecboot/initramfs-kexecboot_1.0.bb13
-rw-r--r--packages/kexecboot/kexecboot_0.3.bb6
-rw-r--r--packages/kexecboot/linux-kexecboot-2.6.26/defconfig-collie4
-rw-r--r--packages/kexecboot/linux-kexecboot_2.6.26.bb3
-rw-r--r--packages/libusb/libusb-compat-0.0.9+0.1.0-beta2/.mtn2git_empty (renamed from packages/libusb/libusb1-0.9.0/.mtn2git_empty)0
-rw-r--r--packages/libusb/libusb-compat-0.0.9+0.1.0-beta2/0.1.0-beta1-gcc3.4-fix.patch (renamed from packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/0.1.0-beta1-gcc3.4-fix.patch)0
-rw-r--r--packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb (renamed from packages/libusb/libusb-compat_0.0.9+0.1.0-beta1.bb)6
-rw-r--r--packages/libusb/libusb1-0.9.2/.mtn2git_empty0
-rw-r--r--packages/libusb/libusb1-0.9.2/0.9.0-gcc3.4-compat-fix.patch (renamed from packages/libusb/libusb1-0.9.0/0.9.0-gcc3.4-compat-fix.patch)0
-rw-r--r--packages/libusb/libusb1_0.9.2.bb (renamed from packages/libusb/libusb1_0.9.0.bb)2
-rw-r--r--packages/nfs-utils/nfs-utils_1.1.2.bb10
14 files changed, 42 insertions, 15 deletions
diff --git a/packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/.mtn2git_empty b/packages/kexecboot/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/.mtn2git_empty
+++ b/packages/kexecboot/files/.mtn2git_empty
diff --git a/packages/kexecboot/files/rootdelay.patch b/packages/kexecboot/files/rootdelay.patch
new file mode 100644
index 0000000000..19a712ab57
--- /dev/null
+++ b/packages/kexecboot/files/rootdelay.patch
@@ -0,0 +1,11 @@
+--- kexecboot-0.3/kexecboot.c 2008-08-03 17:08:31.000000000 +0200
++++ kexecboot/kexecboot.c 2008-08-04 13:35:32.167062391 +0200
+@@ -84,7 +84,7 @@
+ char command[COMMAND_LINE_SIZE + 60];
+ mount(boot->device, "/mnt", boot->fstype, MS_RDONLY, NULL);
+ if( boot->cmdline )
+- sprintf(command,"/usr/sbin/kexec --command-line=\"%s root=%s rootfstype=%s\" -l %s",
++ sprintf(command,"/usr/sbin/kexec --command-line=\"%s root=%s rootfstype=%s rootdelay=3\" -l %s",
+ boot->cmdline, boot->device, boot->fstype, boot->kernelpath);
+ else
+ sprintf(command,"kexec -l %s", boot->kernelpath);
diff --git a/packages/kexecboot/initramfs-kexecboot-image.bb b/packages/kexecboot/initramfs-kexecboot-image.bb
index a55601955a..e0434b5fbd 100644
--- a/packages/kexecboot/initramfs-kexecboot-image.bb
+++ b/packages/kexecboot/initramfs-kexecboot-image.bb
@@ -5,5 +5,5 @@ inherit image
export IMAGE_BASENAME = "initramfs-kexecboot-image"
-IMAGE_INSTALL = "klibc-utils-static-sh klibc-utils-static-mount kexec-static initramfs-kexecboot"
+IMAGE_INSTALL = "initramfs-kexecboot"
IMAGE_LINGUAS = ""
diff --git a/packages/kexecboot/initramfs-kexecboot_1.0.bb b/packages/kexecboot/initramfs-kexecboot_1.0.bb
index e1337419b8..75fb8e8708 100644
--- a/packages/kexecboot/initramfs-kexecboot_1.0.bb
+++ b/packages/kexecboot/initramfs-kexecboot_1.0.bb
@@ -1,11 +1,18 @@
DESCRIPTON = "A init script that mounts a device and kexecs a new kernel from it."
-PR = "r6"
-RDEPENDS = "kexecboot"
+PR = "r7"
+RDEPENDS = "kexecboot klibc-utils-static-mount klibc-utils-static-sh klibc-utils-static-sleep"
+
+FBANGLE = "270"
+INPUTDEV = "/dev/event0"
+
+
do_compile() {
cat > init.sh << EOF
#!/bin/sh
+/bin/sleep 3
/bin/mount -t proc proc /proc
-/usr/bin/kexecboot -a 270 -i /dev/event0
+echo "0 4 1 7" > /proc/sys/kernel/printk
+/usr/bin/kexecboot -a ${FBANGLE} -i ${INPUTDEV}
EOF
}
diff --git a/packages/kexecboot/kexecboot_0.3.bb b/packages/kexecboot/kexecboot_0.3.bb
index 89b9e3b415..f3fb6e35cb 100644
--- a/packages/kexecboot/kexecboot_0.3.bb
+++ b/packages/kexecboot/kexecboot_0.3.bb
@@ -1,12 +1,14 @@
LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
DEPENDS = "klibc"
+RDEPENDS = "kexec-static"
inherit autotools
# You can create your own *-img.h by doing
# ./make-image-header.sh <file>.png HAND
-SRC_URI = "http://projects.linuxtogo.org/frs/download.php/221/kexecboot-${PV}.tar.gz"
+SRC_URI = "http://projects.linuxtogo.org/frs/download.php/221/kexecboot-${PV}.tar.gz \
+ file://rootdelay.patch;patch=1"
S = "${WORKDIR}/kexecboot-${PV}"
diff --git a/packages/kexecboot/linux-kexecboot-2.6.26/defconfig-collie b/packages/kexecboot/linux-kexecboot-2.6.26/defconfig-collie
index 096050a3ae..7a22aa4ee1 100644
--- a/packages/kexecboot/linux-kexecboot-2.6.26/defconfig-collie
+++ b/packages/kexecboot/linux-kexecboot-2.6.26/defconfig-collie
@@ -251,7 +251,7 @@ CONFIG_ALIGNMENT_TRAP=y
#
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 rootdelay=3 mem=64M fbcon=rotate:1 dyntick=enable"
+CONFIG_CMDLINE="console=ttySA0,115200n8 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 rootdelay=3 mem=64M fbcon=rotate:1 dyntick=enable"
# CONFIG_XIP_KERNEL is not set
CONFIG_KEXEC=y
CONFIG_ATAGS_PROC=y
@@ -398,7 +398,7 @@ CONFIG_BLK_DEV_IDE=y
# Please see Documentation/ide/ide.txt for help/info on IDE drives
#
# CONFIG_BLK_DEV_IDE_SATA is not set
-# CONFIG_BLK_DEV_IDEDISK is not set
+CONFIG_BLK_DEV_IDEDISK=y
# CONFIG_IDEDISK_MULTI_MODE is not set
CONFIG_BLK_DEV_IDECS=y
# CONFIG_BLK_DEV_IDECD is not set
diff --git a/packages/kexecboot/linux-kexecboot_2.6.26.bb b/packages/kexecboot/linux-kexecboot_2.6.26.bb
index d7e97a8187..5d31aae5cb 100644
--- a/packages/kexecboot/linux-kexecboot_2.6.26.bb
+++ b/packages/kexecboot/linux-kexecboot_2.6.26.bb
@@ -1,7 +1,6 @@
require linux-kexecboot.inc
-PR = "r1"
-FILESDIR = "linux-rp_${PV}"
+PR = "r2"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_qemuarm = "-1"
DEFAULT_PREFERENCE_qemux86 = "-1"
diff --git a/packages/libusb/libusb1-0.9.0/.mtn2git_empty b/packages/libusb/libusb-compat-0.0.9+0.1.0-beta2/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libusb/libusb1-0.9.0/.mtn2git_empty
+++ b/packages/libusb/libusb-compat-0.0.9+0.1.0-beta2/.mtn2git_empty
diff --git a/packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/0.1.0-beta1-gcc3.4-fix.patch b/packages/libusb/libusb-compat-0.0.9+0.1.0-beta2/0.1.0-beta1-gcc3.4-fix.patch
index 501ba3fb29..501ba3fb29 100644
--- a/packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/0.1.0-beta1-gcc3.4-fix.patch
+++ b/packages/libusb/libusb-compat-0.0.9+0.1.0-beta2/0.1.0-beta1-gcc3.4-fix.patch
diff --git a/packages/libusb/libusb-compat_0.0.9+0.1.0-beta1.bb b/packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb
index fec42b1df7..34cc1ac50d 100644
--- a/packages/libusb/libusb-compat_0.0.9+0.1.0-beta1.bb
+++ b/packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb
@@ -5,15 +5,15 @@ SECTION = "libs"
LICENSE = "LGPL"
PE = "1"
-PR = "r1"
+PR = "r0"
DEPENDS = "libusb1"
-SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-0.1.0-beta1.tar.bz2 \
+SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-0.1.0-beta2.tar.bz2 \
file://0.1.0-beta1-gcc3.4-fix.patch;patch=1 \
"
-S = "${WORKDIR}/libusb-compat-0.1.0-beta1"
+S = "${WORKDIR}/libusb-compat-0.1.0-beta2"
inherit autotools pkgconfig binconfig lib_package
diff --git a/packages/libusb/libusb1-0.9.2/.mtn2git_empty b/packages/libusb/libusb1-0.9.2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libusb/libusb1-0.9.2/.mtn2git_empty
diff --git a/packages/libusb/libusb1-0.9.0/0.9.0-gcc3.4-compat-fix.patch b/packages/libusb/libusb1-0.9.2/0.9.0-gcc3.4-compat-fix.patch
index 1b06945d1a..1b06945d1a 100644
--- a/packages/libusb/libusb1-0.9.0/0.9.0-gcc3.4-compat-fix.patch
+++ b/packages/libusb/libusb1-0.9.2/0.9.0-gcc3.4-compat-fix.patch
diff --git a/packages/libusb/libusb1_0.9.0.bb b/packages/libusb/libusb1_0.9.2.bb
index ce102c0cfc..2c144f053d 100644
--- a/packages/libusb/libusb1_0.9.0.bb
+++ b/packages/libusb/libusb1_0.9.2.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://libusb.sf.net"
SECTION = "libs"
LICENSE = "LGPL"
-PR = "r1"
+PR = "r0"
SRC_URI = "\
${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \
diff --git a/packages/nfs-utils/nfs-utils_1.1.2.bb b/packages/nfs-utils/nfs-utils_1.1.2.bb
index 67adf6e964..bcdabd59e5 100644
--- a/packages/nfs-utils/nfs-utils_1.1.2.bb
+++ b/packages/nfs-utils/nfs-utils_1.1.2.bb
@@ -3,6 +3,8 @@ PRIORITY = "optional"
SECTION = "console/network"
LICENSE = "GPL"
+PR = "2"
+
DEPENDS = "tcp-wrappers libevent"
SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \
@@ -45,14 +47,17 @@ do_install() {
install -m 0755 ${WORKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver
install -d ${D}${sbindir}
+ install -d ${D}${base_sbindir}
install -m 0755 ${S}/utils/exportfs/exportfs ${D}${sbindir}/exportfs
install -m 0755 ${S}/utils/mountd/mountd ${D}${sbindir}/mountd
- install -m 0755 ${S}/utils/mount/mount.nfs ${D}${sbindir}/mount.nfs
+ install -m 0755 ${S}/utils/mount/mount.nfs ${D}${base_sbindir}/mount.nfs
install -m 0755 ${S}/utils/nfsd/nfsd ${D}${sbindir}/nfsd
install -m 0755 ${S}/utils/nfsstat/nfsstat ${D}${sbindir}/nfsstat
install -m 0755 ${S}/utils/showmount/showmount ${D}${sbindir}/showmount
install -m 0755 ${S}/utils/statd/statd ${D}${sbindir}/statd
+ ln -s ${D}/${base_sbindir}/mount.nfs ${D}/${base_sbindir}/mount.nfs4
+
install -d ${D}${mandir}/man8
install -m 0644 ${S}/utils/exportfs/exportfs.man ${D}${mandir}/man8/exportfs.8
install -m 0644 ${S}/utils/mountd/mountd.man ${D}${mandir}/man8/mountd.8
@@ -61,3 +66,6 @@ do_install() {
install -m 0644 ${S}/utils/showmount/showmount.man ${D}${mandir}/man8/showmount.8
install -m 0644 ${S}/utils/statd/statd.man ${D}${mandir}/man8/statd.8
}
+
+PACKAGES =+ "nfs-utils-client"
+FILES_nfs-utils-client = "${base_sbindir}/mount.nfs ${base_sbindir}/mount.nfs4"