[oe-commits] org.oe.dev merge of '848c6e3f16104e7b87568edf06d0d9cc79b5e860'
rwhitby commit
oe at amethyst.openembedded.net
Tue Mar 25 01:11:54 UTC 2008
merge of '848c6e3f16104e7b87568edf06d0d9cc79b5e860'
and 'aff156eb3c821fe61a4b7788e1da432c621d1383'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: f98d5fb7ff32cc1cdb2d7338a2b10010f29b9d1b
ViewMTN: http://monotone.openembedded.org/revision/info/f98d5fb7ff32cc1cdb2d7338a2b10010f29b9d1b
Files:
1
classes/rootfs_ipk.bbclass
packages/pointercal/files/nokia770
packages/update-alternatives/update-alternatives-dpkg-1.13.22
packages/busybox/files/50telnet
packages/busybox/files/login.failsafe
packages/db/db4-native.inc
packages/db/db4.inc
packages/pointercal/files/nokia770/pointercal
packages/pointercal/files/nokia800/pointercal
packages/update-alternatives/update-alternatives-dpkg-1.13.22/paths.patch
classes/e.bbclass
conf/machine/nokia800.conf
packages/busybox/busybox-1.9.1/defconfig
packages/db/db-native_4.2.52.bb
packages/db/db-native_4.3.29.bb
packages/db/db3_3.2.9.bb
packages/db/db_4.2.52.bb
packages/db/db_4.3.29.bb
packages/dpkg/dpkg_1.13.22.bb
packages/dpkg/dpkg_1.13.25.bb
packages/e17/e-wm_cvs.bb
packages/glibc/glibc.inc
packages/openmoko-projects/diversity-daemon_svn.bb
packages/update-alternatives/update-alternatives-dpkg.inc
Diffs:
#
# mt diff -r848c6e3f16104e7b87568edf06d0d9cc79b5e860 -rf98d5fb7ff32cc1cdb2d7338a2b10010f29b9d1b
#
#
#
# patch "classes/rootfs_ipk.bbclass"
# from [c319cef6215ceb9e757092d0eb6ea8303cbaacad]
# to [f2e739e3ef76b513c9eded6b230ecdd3e8f71886]
#
============================================================
--- classes/rootfs_ipk.bbclass c319cef6215ceb9e757092d0eb6ea8303cbaacad
+++ classes/rootfs_ipk.bbclass f2e739e3ef76b513c9eded6b230ecdd3e8f71886
@@ -60,6 +60,9 @@ fakeroot rootfs_ipk_do_rootfs () {
rm -f ${IMAGE_ROOTFS}${libdir}/opkg/lists/*
+ # Keep this line until package manager selection is implemented
+ ln -s opkg ${IMAGE_ROOTFS}${sysconfdir}/ipkg
+
${ROOTFS_POSTPROCESS_COMMAND}
log_check rootfs
#
# mt diff -raff156eb3c821fe61a4b7788e1da432c621d1383 -rf98d5fb7ff32cc1cdb2d7338a2b10010f29b9d1b
#
#
#
# add_dir "packages/pointercal/files/nokia770"
#
# add_dir "packages/update-alternatives/update-alternatives-dpkg-1.13.22"
#
# add_file "packages/busybox/files/50telnet"
# content [1da1219aa725bae7dfd982000c97e159804237f9]
#
# add_file "packages/busybox/files/login.failsafe"
# content [d3eaa22066e6d13ead9d5ee78fd47ad0d251a261]
#
# add_file "packages/db/db4-native.inc"
# content [d9b9ccd6925ca57231ad3f1e281972378ca83be6]
#
# add_file "packages/db/db4.inc"
# content [e7bdabc82bbe6d1c172d1ee155e0024792de676a]
#
# add_file "packages/pointercal/files/nokia770/pointercal"
# content [c5fb496cdb0c31f9e3c21480d720fbe62e96b1be]
#
# add_file "packages/pointercal/files/nokia800/pointercal"
# content [66e43a411ec88dbed1983f70a7f1c5f2f699edd8]
#
# add_file "packages/update-alternatives/update-alternatives-dpkg-1.13.22/paths.patch"
# content [2bb6ec2888beec1f67a4d263182f51544c9546dc]
#
# patch "classes/e.bbclass"
# from [312ae44c83581d25ea920d0970eb19ad5677206f]
# to [2c087f480efe7a90c7cc009a93e634e6e25f16ca]
#
# patch "conf/machine/nokia800.conf"
# from [1e9e59dde23e9afccf1a426c1fb934923f8dd124]
# to [b067467a5bc022fe4141b381f0900eac3a8c5239]
#
# patch "packages/busybox/busybox-1.9.1/defconfig"
# from [183a1034704ae8119a3b8348768ba35a162e96b8]
# to [f0e872e8e6f3bc9941075571caf38d1a62657458]
#
# patch "packages/db/db-native_4.2.52.bb"
# from [5c0fba9adce096fef14fb5d04f1d361ca27d602e]
# to [f5954aaccdc1a79e66f41abe40553c04eb9790d8]
#
# patch "packages/db/db-native_4.3.29.bb"
# from [5b85626af5db30b2e76c61a4f42f2b8894647dcc]
# to [f5954aaccdc1a79e66f41abe40553c04eb9790d8]
#
# patch "packages/db/db3_3.2.9.bb"
# from [160e0e47ee411a288806fb7a98681e9824e90f19]
# to [edda3a971c8f4ec1512f8625e93548438152e661]
#
# patch "packages/db/db_4.2.52.bb"
# from [1a8760b7fc8cc0392968b1042a6f1f4ad8942c90]
# to [10f8a7c33de2cb7e627c1fc0081456e03ce9b6a6]
#
# patch "packages/db/db_4.3.29.bb"
# from [66709e9d9588794467ceb39b685bde44ab5bf724]
# to [41ed5118580382354ff82f6b91aef47cf361cd98]
#
# patch "packages/dpkg/dpkg_1.13.22.bb"
# from [8a65d6983892a8778aea34454d81412dd58743e7]
# to [3d842f90bd0dea654285038ad0bfb6e84a4e1fe2]
#
# patch "packages/dpkg/dpkg_1.13.25.bb"
# from [447b8af2ef375b9607b5df7961b6bd2d573eeef3]
# to [1248fb24d3363ec5cd5452f1274da4f9fb85700f]
#
# patch "packages/e17/e-wm_cvs.bb"
# from [30e8a7e80783fa3d3c697eaa85a84f9109988105]
# to [5002700472e10c4056f6f0f86e315d894a880f22]
#
# patch "packages/glibc/glibc.inc"
# from [04bd84e7ea44c803ddd3735e41396c24902c305f]
# to [e9a2a880277298ca08e7f53a4e5c69127415a5ed]
#
# patch "packages/openmoko-projects/diversity-daemon_svn.bb"
# from [6838bb9ca4040ee4c51c28db47ac68a9a434f15c]
# to [2f221ccc7f8ad502be7a83b018be160aa88a2b77]
#
# patch "packages/update-alternatives/update-alternatives-dpkg.inc"
# from [fd5891d1c2427cb7812d3e42cec9fda9928223b7]
# to [55dbce12aebf658e14d8e13197f8a7ee8740ac1f]
#
============================================================
--- packages/busybox/files/50telnet 1da1219aa725bae7dfd982000c97e159804237f9
+++ packages/busybox/files/50telnet 1da1219aa725bae7dfd982000c97e159804237f9
@@ -0,0 +1,16 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2008 Koen Kooi
+
+# This starts telnetd if the password for 'root' is empty. This is needed for devices without a screen or serial console (wifi router, NAS, etc).
+
+start() {
+ if awk -F: '/^root:/ && ($2 != "") && ($2 !~ /\!/) {exit 1}' /etc/passwd 2>/dev/null
+ then
+ telnetd -l /bin/login.failsafe
+ fi
+}
+
+stop() {
+ killall telnetd
+}
============================================================
--- packages/busybox/files/login.failsafe d3eaa22066e6d13ead9d5ee78fd47ad0d251a261
+++ packages/busybox/files/login.failsafe d3eaa22066e6d13ead9d5ee78fd47ad0d251a261
@@ -0,0 +1,19 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2008 Koen Kooi
+
+grep '^root:[^!]' /etc/passwd >&- 2>&-
+[ "$?" = "0" ] &&
+{
+ echo "Login failed."
+ exit 0
+} || {
+cat << EOF
+ === IMPORTANT ============================
+ Use 'passwd' to set your login password
+ this will disable telnet and enable SSH
+ ------------------------------------------
+EOF
+}
+
+exec /bin/sh --login
============================================================
--- packages/db/db4-native.inc d9b9ccd6925ca57231ad3f1e281972378ca83be6
+++ packages/db/db4-native.inc d9b9ccd6925ca57231ad3f1e281972378ca83be6
@@ -0,0 +1,28 @@
+# This wrapper builds a native version of the Oracal
+# Berkeley DB for those packages which need it (e.g.
+# perl).
+
+VIRTUAL_NAME = "virtual/db-native"
+CONFLICTS = "db3-native"
+#PR tracks the non-native package
+
+inherit native
+
+do_package() {
+:
+}
+
+PACKAGES = ""
+
+do_stage() {
+ # The .h files get installed read-only, the autostage
+ # function just uses cp -pPR, so do this by hand
+ rm -rf ${STAGE_TEMP}
+ mkdir -p ${STAGE_TEMP}
+ oe_runmake DESTDIR="${STAGE_TEMP}" install_include
+ cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/.
+ rm -rf ${STAGE_TEMP}
+ oe_libinstall -so -C .libs libdb-${PVM} ${STAGING_LIBDIR}
+ ln -sf libdb-${PVM}.so ${STAGING_LIBDIR}/libdb.so
+ ln -sf libdb-${PVM}.a ${STAGING_LIBDIR}/libdb.a
+}
============================================================
--- packages/db/db4.inc e7bdabc82bbe6d1c172d1ee155e0024792de676a
+++ packages/db/db4.inc e7bdabc82bbe6d1c172d1ee155e0024792de676a
@@ -0,0 +1,96 @@
+# Version 4 of the Berkeley DB from Oracle
+#
+# At present this package only installs the DB code
+# itself (shared libraries, .a in the dev package),
+# documentation and headers.
+#
+# The headers have the same names as those as v3
+# of the DB, only one version can be used *for dev*
+# at once - DB3 and DB4 can both be installed on the
+# same system at the same time if really necessary.
+
+
+DESCRIPTION = "Berkeley DB v4."
+HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html"
+SECTION = "libs"
+LICENSE = "BSD"
+VIRTUAL_NAME ?= "virtual/db"
+CONFLICTS = "db3"
+
+SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz"
+
+inherit autotools
+
+# Put virtual/db in any appropriate provider of a
+# relational database, use it as a dependency in
+# place of a specific db and use:
+#
+# PREFERRED_PROVIDER_virtual/db
+#
+# to select the correct db in the build (distro) .conf
+PROVIDES += "${VIRTUAL_NAME}"
+
+# bitbake isn't quite clever enough to deal with db,
+# the distribution sits in the expected directory, but all
+# the builds must occur from a sub-directory. The following
+# persuades bitbake to go to the right place
+S = "${WORKDIR}/db-${PV}/dist"
+B = "${WORKDIR}/db-${PV}/build_unix"
+
+# The executables go in a separate package - typically there
+# is no need to install these unless doing real database
+# management on the system.
+PACKAGES += " ${PN}-bin"
+
+# Package contents
+FILES_${PN} = "${libdir}/libdb-4*so*"
+FILES_${PN}-bin = "${bindir}/*"
+# The dev package has the .so link (as in db3) and the .a's -
+# it is therefore incompatible (cannot be installed at the
+# same time) as the db3 package
+FILES_${PN}-dev = "${includedir} ${libdir}/*"
+
+EXTRA_OECONF = "${DB4_CONFIG}"
+
+# Override the MUTEX setting here, the POSIX library is
+# the default - "POSIX/pthreads/library".
+# Don't ignore the nice SWP instruction on the ARM:
+# These enable the ARM assembler mutex code, this won't
+# work with thumb compilation...
+ARM_MUTEX = "--with-mutex=ARM/gcc-assembly"
+MUTEX = ""
+MUTEX_arm = "${ARM_MUTEX}"
+MUTEX_armeb = "${ARM_MUTEX}"
+EXTRA_OECONF += "${MUTEX}"
+
+# Cancel the site stuff - it's set for db3 and destroys the
+# configure.
+CONFIG_SITE = ""
+do_configure() {
+ ( cd ${WORKDIR}/db-${PV}/dist ; gnu-configize )
+ oe_runconf
+}
+
+
+do_install_append() {
+ # The docs end up in /usr/docs - not right.
+ if test -d "${D}/${prefix}/docs"
+ then
+ mkdir -p "${D}/${datadir}"
+ test ! -d "${D}/${docdir}" || rm -rf "${D}/${docdir}"
+ mv "${D}/${prefix}/docs" "${D}/${docdir}"
+ fi
+}
+
+do_stage() {
+ # The .h files get installed read-only, the autostage
+ # function just uses cp -pPR, so do this by hand
+ rm -rf ${STAGE_TEMP}
+ mkdir -p ${STAGE_TEMP}
+ oe_runmake DESTDIR="${STAGE_TEMP}" install_include
+ cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/.
+ rm -rf ${STAGE_TEMP}
+ oe_libinstall -so -C .libs libdb-${PVM} ${STAGING_LIBDIR}
+ ln -sf libdb-${PVM}.so ${STAGING_LIBDIR}/libdb.so
+ ln -sf libdb-${PVM}.a ${STAGING_LIBDIR}/libdb.a
+}
============================================================
--- packages/pointercal/files/nokia770/pointercal c5fb496cdb0c31f9e3c21480d720fbe62e96b1be
+++ packages/pointercal/files/nokia770/pointercal c5fb496cdb0c31f9e3c21480d720fbe62e96b1be
@@ -0,0 +1 @@
+-15355 20 56077944 28 -9469 35056912 65536
============================================================
--- packages/pointercal/files/nokia800/pointercal 66e43a411ec88dbed1983f70a7f1c5f2f699edd8
+++ packages/pointercal/files/nokia800/pointercal 66e43a411ec88dbed1983f70a7f1c5f2f699edd8
@@ -0,0 +1 @@
+14693 91 -4137352 7 -9660 35213352 65536
============================================================
--- packages/update-alternatives/update-alternatives-dpkg-1.13.22/paths.patch 2bb6ec2888beec1f67a4d263182f51544c9546dc
+++ packages/update-alternatives/update-alternatives-dpkg-1.13.22/paths.patch 2bb6ec2888beec1f67a4d263182f51544c9546dc
@@ -0,0 +1,26 @@
+diff -ruN dpkg-1.13.22.orig/scripts/update-alternatives.pl dpkg-1.13.22/scripts/update-alternatives.pl
+--- dpkg-1.13.22.orig/scripts/update-alternatives.pl 2006-06-21 01:46:12.000000000 -0300
++++ dpkg-1.13.22/scripts/update-alternatives.pl 2007-08-02 19:36:47.000000000 -0300
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl --
+
+ $admindir= "/var/lib/dpkg"; # This line modified by Makefile
+-$dpkglibdir= "../utils"; # This line modified by Makefile
++$dpkglibdir= "/usr/lib/dpkg"; # This line modified by Makefile
+ $version= '0.93.80'; # This line modified by Makefile
+ push (@INC, $dpkglibdir);
+ require 'dpkg-gettext.pl';
+@@ -129,6 +129,12 @@
+ &checkmanymodes;
+ @ARGV >= 4 || &badusage(_g("--install needs <link> <name> <path> <priority>"));
+ ($alink,$name,$apath,$apriority, at ARGV) = @ARGV;
++ if (! -e $apath) {
++ $apath = substr($alink,0,rindex($alink,"/")+1).$apath;
++ }
++ if (! -e $apath) {
++ &quit(sprintf(_g("Error: file not found: %s"), $apath));
++ }
+ $apriority =~ m/^[-+]?\d+/ || &badusage(_g("priority must be an integer"));
+ $mode= 'install';
+ } elsif (m/^--(remove|set)$/) {
+
============================================================
--- classes/e.bbclass 312ae44c83581d25ea920d0970eb19ad5677206f
+++ classes/e.bbclass 2c087f480efe7a90c7cc009a93e634e6e25f16ca
@@ -1,6 +1,7 @@ SECTION = "e/apps"
HOMEPAGE = "http://www.enlightenment.org"
SECTION = "e/apps"
-SRC_URI = "http://download.enlightenment.org/snapshots/2007-06-17/${PN}-${PV}.tar.gz"
+SRC_URI = "${E_CVS};module=e17/apps/${SRCNAME}"
+S = "${WORKDIR}/${SRCNAME}"
inherit autotools pkgconfig binconfig
@@ -9,27 +10,10 @@ addtask prepsources after do_fetch befor
}
addtask prepsources after do_fetch before do_unpack
-export CURL_CONFIG = "${STAGING_BINDIR_CROSS}/curl-config"
-export EDB_CONFIG = "${STAGING_BINDIR_CROSS}/edb-config"
-export EET_CONFIG = "${STAGING_BINDIR_CROSS}/eet-config"
-export EVAS_CONFIG = "${STAGING_BINDIR_CROSS}/evas-config"
-export ECORE_CONFIG = "${STAGING_BINDIR_CROSS}/ecore-config"
-export EMBRYO_CONFIG = "${STAGING_BINDIR_CROSS}/embryo-config"
-export ENGRAVE_CONFIG = "${STAGING_BINDIR_CROSS}/engrave-config"
-export ENLIGHTENMENT_CONFIG = "${STAGING_BINDIR_CROSS}/enlightenment-config"
-export EPSILON_CONFIG = "${STAGING_BINDIR_CROSS}/epsilon-config"
-export EPEG_CONFIG = "${STAGING_BINDIR_CROSS}/epeg-config"
-export ESMART_CONFIG = "${STAGING_BINDIR_CROSS}/esmart-config"
-export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
-export IMLIB2_CONFIG = "${STAGING_BINDIR_CROSS}/imlib2-config"
+export CURL_CONFIG = "${STAGING_BINDIR_CROSS}/curl-config"
+export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
-#do_compile_prepend() {
-# find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
-# find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:'
-#}
-
-PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev"
-FILES_${PN} += "${libdir}/lib*.so.*"
+PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev ${PN}-lib"
+FILES_${PN}-lib = "${libdir}/lib*.so.*"
FILES_${PN}-themes = "${datadir}/${PN}/themes ${datadir}/${PN}/data ${datadir}/${PN}/fonts ${datadir}/${PN}/pointers ${datadir}/${PN}/images ${datadir}/${PN}/users ${datadir}/${PN}/images ${datadir}/${PN}/styles"
FILES_${PN}-dev += "${includedir} ${libdir}/lib*.so"
-
============================================================
--- conf/machine/nokia800.conf 1e9e59dde23e9afccf1a426c1fb934923f8dd124
+++ conf/machine/nokia800.conf b067467a5bc022fe4141b381f0900eac3a8c5239
@@ -1,5 +1,5 @@
#@TYPE: Machine
-#@NAME: Nokia 770 internet tablet
+#@NAME: Nokia 800 internet tablet
#@DESCRIPTION: Machine configuration for the Nokia 800
TARGET_ARCH = "arm"
PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6"
============================================================
--- packages/busybox/busybox-1.9.1/defconfig 183a1034704ae8119a3b8348768ba35a162e96b8
+++ packages/busybox/busybox-1.9.1/defconfig f0e872e8e6f3bc9941075571caf38d1a62657458
@@ -633,7 +633,7 @@ CONFIG_FEATURE_TELNET_AUTOLOGIN=y
CONFIG_TELNET=y
# CONFIG_FEATURE_TELNET_TTYPE is not set
CONFIG_FEATURE_TELNET_AUTOLOGIN=y
-# CONFIG_TELNETD is not set
+CONFIG_TELNETD=y
# CONFIG_FEATURE_TELNETD_STANDALONE is not set
CONFIG_TFTP=y
CONFIG_FEATURE_TFTP_GET=y
============================================================
--- packages/db/db-native_4.2.52.bb 5c0fba9adce096fef14fb5d04f1d361ca27d602e
+++ packages/db/db-native_4.2.52.bb f5954aaccdc1a79e66f41abe40553c04eb9790d8
@@ -1,27 +1,2 @@
-# This wrapper builds a native version of the SleepyCat
-# Berkeley DB for those packages which need it (e.g.
-# perl).
-SECTION = "libs"
-VIRTUAL_NAME = "virtual/db-native"
-CONFLICTS = "db3-native"
-#PR tracks the non-native package
-
-inherit native
-
require db_${PV}.bb
+require db4-native.inc
-
-PACKAGES = ""
-
-do_stage() {
- # The .h files get installed read-only, the autostage
- # function just uses cp -pPR, so do this by hand
- rm -rf ${STAGE_TEMP}
- mkdir -p ${STAGE_TEMP}
- oe_runmake DESTDIR="${STAGE_TEMP}" install_include
- cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/.
- rm -rf ${STAGE_TEMP}
- oe_libinstall -so -C .libs libdb-4.2 ${STAGING_LIBDIR}
- ln -sf libdb-4.2.so ${STAGING_LIBDIR}/libdb.so
- ln -sf libdb-4.2.a ${STAGING_LIBDIR}/libdb.a
-}
-
============================================================
--- packages/db/db-native_4.3.29.bb 5b85626af5db30b2e76c61a4f42f2b8894647dcc
+++ packages/db/db-native_4.3.29.bb f5954aaccdc1a79e66f41abe40553c04eb9790d8
@@ -1,17 +1,2 @@
-# This wrapper builds a native version of the SleepyCat
-# Berkeley DB for those packages which need it (e.g.
-# perl).
-SECTION = "libs"
-VIRTUAL_NAME = "virtual/db-native"
-CONFLICTS = "db3-native"
-#PR tracks the non-native package
-
-inherit native
-
require db_${PV}.bb
+require db4-native.inc
-
-do_package() {
-:
-}
-
-PACKAGES = ""
============================================================
--- packages/db/db3_3.2.9.bb 160e0e47ee411a288806fb7a98681e9824e90f19
+++ packages/db/db3_3.2.9.bb edda3a971c8f4ec1512f8625e93548438152e661
@@ -1,8 +1,8 @@ DESCRIPTION = "Berkeley DB v3."
SECTION = "libs"
DESCRIPTION = "Berkeley DB v3."
-HOMEPAGE = "http://www.sleepycat.com"
-LICENSE = "BSD Sleepycat"
-PR = "r2"
+HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html"
+LICENSE = "BSD"
+PR = "r3"
VIRTUAL_NAME ?= "virtual/db"
CONFLICTS = "db"
@@ -11,7 +11,7 @@ PROVIDES += "${VIRTUAL_NAME}"
# a build to select the desired one.
PROVIDES += "${VIRTUAL_NAME}"
-SRC_URI = "http://download-west.oracle.com/berkeley-db/db-${PV}.tar.gz \
+SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz \
file://autofoo.patch;patch=1"
S = "${WORKDIR}/db-${PV}/dist"
B = %s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list