[oe-commits] org.oe.dev merge of '0b6935355f7d83e008381e3bc46345a5f8c686d9'
hrw commit
openembedded-commits at lists.openembedded.org
Fri Nov 23 17:04:58 UTC 2007
merge of '0b6935355f7d83e008381e3bc46345a5f8c686d9'
and 'e48283e1dd58b2449622e99ee8018852bac6e0fa'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 5e3dbf2b21f8f0f7de0341a21bfdcf8effa5be34
ViewMTN: http://monotone.openembedded.org/revision/info/5e3dbf2b21f8f0f7de0341a21bfdcf8effa5be34
Files:
1
packages/uclibc/uclibc-0.9.29/qemux86
packages/libdaemon/libdaemon_0.12.bb
packages/uclibc/uclibc-0.9.29/qemux86/uClibc.machine
classes/insane.bbclass
packages/zaurus-updater/zaurus-updater/updater.sh
packages/zaurus-updater/zaurus-updater.bb
Diffs:
#
# mt diff -r0b6935355f7d83e008381e3bc46345a5f8c686d9 -r5e3dbf2b21f8f0f7de0341a21bfdcf8effa5be34
#
#
#
# add_dir "packages/uclibc/uclibc-0.9.29/qemux86"
#
# add_file "packages/libdaemon/libdaemon_0.12.bb"
# content [096ac098f123427d223ff699f237de9e4c87e0fa]
#
# add_file "packages/uclibc/uclibc-0.9.29/qemux86/uClibc.machine"
# content [0ba5bf1dcc968c90b49471fe12c3dee50977813a]
#
# patch "classes/insane.bbclass"
# from [969f0ea4a41bb686333bda84032d4f9250a61c3b]
# to [c89ab78b14303099a174102687650f7ca13b143f]
#
============================================================
--- packages/libdaemon/libdaemon_0.12.bb 096ac098f123427d223ff699f237de9e4c87e0fa
+++ packages/libdaemon/libdaemon_0.12.bb 096ac098f123427d223ff699f237de9e4c87e0fa
@@ -0,0 +1,20 @@
+DESCRIPTION = "libdaemon is a lightweight C library which eases the writing of UNIX daemons."
+SECTION = "libs"
+AUTHOR = "Lennart Poettering <lennart at poettering.net>"
+HOMEPAGE = "http://0pointer.de/lennart/projects/libdaemon/"
+LICENSE = "LGPL"
+PR = "r0"
+
+SRC_URI = "http://0pointer.de/lennart/projects/libdaemon/libdaemon-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-lynx --disable-doxygen"
+
+do_stage () {
+ oe_libinstall -a -so -C libdaemon libdaemon ${STAGING_LIBDIR}
+ install -d ${STAGING_INCDIR}/libdaemon
+ for i in daemon.h dlog.h dexec.h dfork.h dsignal.h dnonblock.h dpid.h; do
+ install -m 0644 ${S}/libdaemon/$i ${STAGING_INCDIR}/libdaemon/
+ done
+}
============================================================
--- packages/uclibc/uclibc-0.9.29/qemux86/uClibc.machine 0ba5bf1dcc968c90b49471fe12c3dee50977813a
+++ packages/uclibc/uclibc-0.9.29/qemux86/uClibc.machine 0ba5bf1dcc968c90b49471fe12c3dee50977813a
@@ -0,0 +1,68 @@
+#
+# Automatically generated make config: don't edit
+# Fri Nov 23 15:49:33 2007
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+TARGET_i386=y
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="i386"
+FORCE_OPTIONS_FOR_ARCH=y
+CONFIG_GENERIC_386=y
+# CONFIG_386 is not set
+# CONFIG_486 is not set
+# CONFIG_586 is not set
+# CONFIG_586MMX is not set
+# CONFIG_686 is not set
+# CONFIG_PENTIUMII is not set
+# CONFIG_PENTIUMIII is not set
+# CONFIG_PENTIUM4 is not set
+# CONFIG_K6 is not set
+# CONFIG_K7 is not set
+# CONFIG_ELAN is not set
+# CONFIG_CRUSOE is not set
+# CONFIG_WINCHIPC6 is not set
+# CONFIG_WINCHIP2 is not set
+# CONFIG_CYRIXIII is not set
+# CONFIG_NEHEMIAH is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_LITTLE_ENDIAN=y
+
+#
+# Using Little Endian
+#
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
============================================================
--- classes/insane.bbclass 969f0ea4a41bb686333bda84032d4f9250a61c3b
+++ classes/insane.bbclass c89ab78b14303099a174102687650f7ca13b143f
@@ -57,8 +57,12 @@ def package_qa_get_machine_dict():
"arm" : ( 40, 97, 0, True, True),
"armeb": ( 40, 97, 0, False, True),
"powerpc": ( 20, 0, 0, False, True),
+ "i386": ( 3, 0, 0, True, True),
+ "i486": ( 3, 0, 0, True, True),
+ "i586": ( 3, 0, 0, True, True),
+ "i686": ( 3, 0, 0, True, True),
"mipsel": ( 8, 0, 0, True, True),
- "avr32": (6317, 0, 0, False, True),
+ "avr32": (6317, 0, 0, False, True),
},
"uclinux-uclibc" : {
"bfin": ( 106, 0, 0, True, True),
#
# mt diff -re48283e1dd58b2449622e99ee8018852bac6e0fa -r5e3dbf2b21f8f0f7de0341a21bfdcf8effa5be34
#
#
#
# patch "packages/zaurus-updater/zaurus-updater/updater.sh"
# from [dcc33e7466ed242c616fb02fb777ba2dd39a1eba]
# to [c0efdd12ede0381c80ff763c2f9999b8d6d722f8]
#
# patch "packages/zaurus-updater/zaurus-updater.bb"
# from [ad00179ab36c465f5519eb89cc47983be97b1ea6]
# to [d8d6f55921f4ab9b5f5103bfc8d86a2485f2ac56]
#
============================================================
--- packages/zaurus-updater/zaurus-updater/updater.sh dcc33e7466ed242c616fb02fb777ba2dd39a1eba
+++ packages/zaurus-updater/zaurus-updater/updater.sh c0efdd12ede0381c80ff763c2f9999b8d6d722f8
@@ -21,12 +21,6 @@
# - c760/c860 has bigger rootfs - use it
#
-date_log()
-{
- echo "$LOG: `date`"
-}
-LOG="updater start"; date_log
-
DATAPATH=$1
TMPPATH=/tmp/update
TMPDATA=$TMPPATH/tmpdata.bin
@@ -41,11 +35,9 @@ RO_MTD_NO=`echo $RO_MTD_LINE | cut -d: -
RO_MTD_LINE=`cat /proc/mtd | grep "\<NAND\>.*\<2\>" | tail -n 1`
fi
RO_MTD_NO=`echo $RO_MTD_LINE | cut -d: -f1 | cut -dd -f2`
-RO_MTD_SIZE_HEX=`echo $RO_MTD_LINE | cut -d" " -f2`
RO_MTD=/dev/mtd$RO_MTD_NO
+ROOTFS_SIZE=`echo $RO_MTD_LINE | cut -d" " -f2`
-echo "RO_MTD = $RO_MTD"
-
LOGOCAL_MTD=/dev/mtd1
VERBLOCK=0x48000
@@ -167,9 +159,7 @@ do_flashing()
if [ $ISFORMATTED = 0 ]
then
- LOG="flash erasing ($TARGET_MTD) start"; date_log
/sbin/eraseall $TARGET_MTD > /dev/null 2>&1
- LOG="flash erasing ($TARGET_MTD) end"; date_log
ISFORMATTED=1
fi
@@ -184,7 +174,6 @@ do_flashing()
if [ -e $TMPHEAD ]
then
- LOG="nandlogical read start"; date_log
VTMPNAME=$TMPPATH'/vtmp'`date '+%s'`'.tmp'
MTMPNAME=$TMPPATH'/mtmp'`date '+%s'`'.tmp'
/sbin/nandlogical $LOGOCAL_MTD READ $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1
@@ -192,7 +181,6 @@ do_flashing()
/sbin/verchg -v $VTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1
/sbin/verchg -m $MTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1
- LOG="nandlogical read end"; date_log
fi
#loop
@@ -240,16 +228,12 @@ do_flashing()
then
if [ -e $VTMPNAME ]
then
- LOG="nandlogical write2 start"; date_log
/sbin/nandlogical $LOGOCAL_MTD WRITE $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1
- LOG="nandlogical write2 end"; date_log
rm -f $VTMPNAME > /dev/null 2>&1
fi
if [ -e $MTMPNAME ]
then
- LOG="nandlogical write3 start"; date_log
/sbin/nandlogical $LOGOCAL_MTD WRITE $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
- LOG="nandlogical write3 end"; date_log
rm -f $MTMPNAME > /dev/null 2>&1
fi
echo 'Done.'
@@ -264,27 +248,18 @@ case "$MODEL" in
case "$MODEL" in
SL-B500|SL-5600)
ZAURUS='poodle'
- ROOTFS_SIZE=0x1600000
;;
SL-6000)
ZAURUS='tosa'
- ROOTFS_SIZE=0x1E00000
;;
SL-C1000)
ZAURUS='akita'
- ROOTFS_SIZE=0x1900000
;;
- SL-C700|SL-C750|SL-7500)
+ SL-C700|SL-C750|SL-7500|SL-C760|SL-C860)
ZAURUS='c7x0'
- ROOTFS_SIZE=0x1900000
;;
- SL-C760|SL-C860)
- ZAURUS='c7x0'
- ROOTFS_SIZE=0x3500000
- ;;
SL-C3000|SL-C3100|SL-C3200)
ZAURUS='c3x00'
- ROOTFS_SIZE=0x0500000
check_for_hdd
check_for_tar
;;
@@ -302,8 +277,6 @@ mkdir -p $TMPPATH > /dev/null 2>&1
mkdir -p $TMPPATH > /dev/null 2>&1
-LOG="updater after model"; date_log
-
cd $DATAPATH/
for TARGETFILE in zimage zImage zImage.bin zimage.bin ZIMAGE ZIMAGE.BIN initrd.bin INITRD.BIN hdimage1.tgz HDIMAGE1.TGZ
@@ -338,11 +311,9 @@ do
HDTOP=`expr $DATASIZE - 16`
/sbin/bcut -a $HDTOP -s 16 -o $TMPHEAD $TARGETFILE
echo "HDTOP=$HDTOP"
- LOG="updater flashing kernel start"; date_log
FLASH_TYPE="kernel"
do_flashing
FLASH_TYPE=""
- LOG="updater flashing kernel end"; date_log
;;
initrd.bin)
@@ -361,11 +332,9 @@ do
DATAPOS=16
ONESIZE=1048576
/sbin/bcut -s 16 -o $TMPHEAD $TARGETFILE
- LOG="updater flashing rootfs start"; date_log
FLASH_TYPE="rootfs"
do_flashing
FLASH_TYPE=""
- LOG="updater flashing rootfs end"; date_log
;;
hdimage1.tgz)
============================================================
--- packages/zaurus-updater/zaurus-updater.bb ad00179ab36c465f5519eb89cc47983be97b1ea6
+++ packages/zaurus-updater/zaurus-updater.bb d8d6f55921f4ab9b5f5103bfc8d86a2485f2ac56
@@ -1,7 +1,7 @@ LICENSE = "zaurus-updater"
DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
DEPENDS = "encdec-updater-native"
LICENSE = "zaurus-updater"
-PR = "r9"
+PR = "r11"
PACKAGES = ""
PACKAGE_ARCH = "${MACHINE_ARCH}"
More information about the Openembedded-commits
mailing list