[oe-commits] org.oe.dev merge of '604e4566ff77ba4e877e134951341dca1fbf145e'
koen commit
oe at amethyst.openembedded.net
Mon Sep 1 17:53:50 UTC 2008
merge of '604e4566ff77ba4e877e134951341dca1fbf145e'
and 'f2ceedc03b70c983dbbb20c9f461a7f40d0941e7'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 445558a95545ea34a4a29da670d95cfcbb9fa765
ViewMTN: http://monotone.openembedded.org/revision/info/445558a95545ea34a4a29da670d95cfcbb9fa765
Files:
1
packages/cmake/cmake.inc
packages/libusb/libusb-compat-0.0.9+0.1.0-beta1
packages/libusb/libusb-compat-0.0.9+0.1.0-beta2
packages/libusb/libusb-compat_0.0.9+0.1.0-beta1.bb
packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb
packages/libusb/libusb1-0.9.0
packages/libusb/libusb1-0.9.2
packages/libusb/libusb1_0.9.0.bb
packages/libusb/libusb1_0.9.2.bb
packages/kexecboot/files
packages/kexecboot/files/rootdelay.patch
packages/kexecboot/initramfs-kexecboot-image.bb
packages/kexecboot/initramfs-kexecboot_1.0.bb
packages/kexecboot/kexecboot_0.3.bb
packages/kexecboot/linux-kexecboot-2.6.26/defconfig-collie
packages/kexecboot/linux-kexecboot_2.6.26.bb
packages/nfs-utils/nfs-utils_1.1.2.bb
Diffs:
#
# mt diff -r604e4566ff77ba4e877e134951341dca1fbf145e -r445558a95545ea34a4a29da670d95cfcbb9fa765
#
#
#
# patch "packages/cmake/cmake.inc"
# from [66a198fe039d2d1080772aaa30ea89bae7541dc3]
# to [c796c2d98faaa0845fe3a8fd107490885f66db03]
#
============================================================
--- packages/cmake/cmake.inc 66a198fe039d2d1080772aaa30ea89bae7541dc3
+++ packages/cmake/cmake.inc c796c2d98faaa0845fe3a8fd107490885f66db03
@@ -5,6 +5,7 @@ SECTION = "console/utils"
HOMEPAGE = "http://www.cmake.org/"
LICENSE = "Berkeley-style license"
SECTION = "console/utils"
+PR = "r1"
CMAKE_MAJOR_VERSION = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz"
@@ -14,5 +15,5 @@ do_configure () {
S = "${WORKDIR}/cmake-${PV}"
do_configure () {
- ./configure --prefix=${base_prefix} || die "./bootstrap failed"
+ ./configure --prefix=${prefix} || die "./bootstrap failed"
}
#
# mt diff -rf2ceedc03b70c983dbbb20c9f461a7f40d0941e7 -r445558a95545ea34a4a29da670d95cfcbb9fa765
#
#
#
# rename "packages/libusb/libusb-compat-0.0.9+0.1.0-beta1"
# to "packages/libusb/libusb-compat-0.0.9+0.1.0-beta2"
#
# rename "packages/libusb/libusb-compat_0.0.9+0.1.0-beta1.bb"
# to "packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb"
#
# rename "packages/libusb/libusb1-0.9.0"
# to "packages/libusb/libusb1-0.9.2"
#
# rename "packages/libusb/libusb1_0.9.0.bb"
# to "packages/libusb/libusb1_0.9.2.bb"
#
# add_dir "packages/kexecboot/files"
#
# add_file "packages/kexecboot/files/rootdelay.patch"
# content [4aac2eeabb2c5f35e3565672496f0a14ddca9c00]
#
# patch "packages/kexecboot/initramfs-kexecboot-image.bb"
# from [49a37389a0b8c994692be3e879add614ff95ceff]
# to [73e4f04db5777fdeaca9c8f23d6c269d574e1012]
#
# patch "packages/kexecboot/initramfs-kexecboot_1.0.bb"
# from [824b48b2024b712c5c2be285049697318d6dc372]
# to [d3cfea5e56d92934495f6342d176e974b5c9baf3]
#
# patch "packages/kexecboot/kexecboot_0.3.bb"
# from [0ca1d7664f36aed1936462e2c084e6fb1fcfcece]
# to [549463678e80781a4efa57e3c566d8668953cb08]
#
# patch "packages/kexecboot/linux-kexecboot-2.6.26/defconfig-collie"
# from [89b2f472fb93e5c5cc06598c758a90308c3c0106]
# to [89887186a0de9fe4ac9fad235b3f52a56a8524f6]
#
# patch "packages/kexecboot/linux-kexecboot_2.6.26.bb"
# from [287d3bbbebb212c90ad5294bbd7bf094aa17bed4]
# to [c81d28c54ee3911d010f1fe10568274d5cba04ca]
#
# patch "packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb"
# from [eca681d4a91dfb5cb7fa4e2d5326809890304bba]
# to [e5d649a0a56ef19311c60e326a809da275cdba29]
#
# patch "packages/libusb/libusb1_0.9.2.bb"
# from [b413efeaadf36cc125444ba8f9db23c724492158]
# to [daa46b7579d1a354a7b7107c31e52b4629a48180]
#
# patch "packages/nfs-utils/nfs-utils_1.1.2.bb"
# from [c8fc676bb8563f810f362e205ae46c3b75388b51]
# to [1815e0ef2aa6e30bdea10f6313e236b9f67ac58f]
#
============================================================
--- packages/kexecboot/files/rootdelay.patch 4aac2eeabb2c5f35e3565672496f0a14ddca9c00
+++ packages/kexecboot/files/rootdelay.patch 4aac2eeabb2c5f35e3565672496f0a14ddca9c00
@@ -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);
============================================================
--- packages/kexecboot/initramfs-kexecboot-image.bb 49a37389a0b8c994692be3e879add614ff95ceff
+++ packages/kexecboot/initramfs-kexecboot-image.bb 73e4f04db5777fdeaca9c8f23d6c269d574e1012
@@ -5,5 +5,5 @@ export IMAGE_BASENAME = "initramfs-kexec
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 = ""
============================================================
--- packages/kexecboot/initramfs-kexecboot_1.0.bb 824b48b2024b712c5c2be285049697318d6dc372
+++ packages/kexecboot/initramfs-kexecboot_1.0.bb d3cfea5e56d92934495f6342d176e974b5c9baf3
@@ -1,11 +1,18 @@ DESCRIPTON = "A init script that mounts
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
}
============================================================
--- packages/kexecboot/kexecboot_0.3.bb 0ca1d7664f36aed1936462e2c084e6fb1fcfcece
+++ packages/kexecboot/kexecboot_0.3.bb 549463678e80781a4efa57e3c566d8668953cb08
@@ -1,12 +1,14 @@ LICENSE = "GPL"
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}"
============================================================
--- packages/kexecboot/linux-kexecboot-2.6.26/defconfig-collie 89b2f472fb93e5c5cc06598c758a90308c3c0106
+++ packages/kexecboot/linux-kexecboot-2.6.26/defconfig-collie 89887186a0de9fe4ac9fad235b3f52a56a8524f6
@@ -251,7 +251,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0
#
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
============================================================
--- packages/kexecboot/linux-kexecboot_2.6.26.bb 287d3bbbebb212c90ad5294bbd7bf094aa17bed4
+++ packages/kexecboot/linux-kexecboot_2.6.26.bb c81d28c54ee3911d010f1fe10568274d5cba04ca
@@ -1,7 +1,6 @@ require linux-kexecboot.inc
require linux-kexecboot.inc
-PR = "r1"
-FILESDIR = "linux-rp_${PV}"
+PR = "r2"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_qemuarm = "-1"
DEFAULT_PREFERENCE_qemux86 = "-1"
============================================================
--- packages/libusb/libusb-compat_0.0.9+0.1.0-beta1.bb eca681d4a91dfb5cb7fa4e2d5326809890304bba
+++ packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb e5d649a0a56ef19311c60e326a809da275cdba29
@@ -5,15 +5,15 @@ PE = "1"
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
============================================================
--- packages/libusb/libusb1_0.9.0.bb b413efeaadf36cc125444ba8f9db23c724492158
+++ packages/libusb/libusb1_0.9.2.bb daa46b7579d1a354a7b7107c31e52b4629a48180
@@ -4,7 +4,7 @@ LICENSE = "LGPL"
SECTION = "libs"
LICENSE = "LGPL"
-PR = "r1"
+PR = "r0"
SRC_URI = "\
${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \
============================================================
--- packages/nfs-utils/nfs-utils_1.1.2.bb c8fc676bb8563f810f362e205ae46c3b75388b51
+++ packages/nfs-utils/nfs-utils_1.1.2.bb 1815e0ef2aa6e30bdea10f6313e236b9f67ac58f
@@ -3,6 +3,8 @@ LICENSE = "GPL"
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"
More information about the Openembedded-commits
mailing list