[oe-commits] org.oe.dev merge of 'bee9775a7c7c9473463045701aaa9f372e1173ce'
mickeyl commit
openembedded-commits at lists.openembedded.org
Wed Feb 13 18:29:21 UTC 2008
merge of 'bee9775a7c7c9473463045701aaa9f372e1173ce'
and 'e65ed9e5ef27495a6e0a27b271aaeb16c87cc317'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: a50ff76c6f7f099d4944b622fd429d3d37da3875
ViewMTN: http://monotone.openembedded.org/revision/info/a50ff76c6f7f099d4944b622fd429d3d37da3875
Files:
1
packages/opie-irc/files
packages/opie-irc/files/utf8-topic.patch
packages/opie-irc/files/utf8.patch
conf/distro/sharprom-compatible.conf
packages/opie-irc/opie-irc_1.2.3.bb
packages/opie-irc/opie-irc_cvs.bb
packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
packages/busybox/busybox-1.9.1
packages/busybox/busybox_1.9.1.bb
conf/distro/include/preferred-om-2008-versions.inc
packages/busybox/busybox-1.7.2/defconfig
packages/busybox/busybox_1.7.2.bb
packages/python/python_2.5.1.bb
Diffs:
#
# mt diff -rbee9775a7c7c9473463045701aaa9f372e1173ce -ra50ff76c6f7f099d4944b622fd429d3d37da3875
#
#
#
# delete "packages/opie-irc/files"
#
# delete "packages/opie-irc/files/utf8-topic.patch"
#
# delete "packages/opie-irc/files/utf8.patch"
#
# patch "conf/distro/sharprom-compatible.conf"
# from [dddff62a6004aa3bd797558e337f219b7a2ec7af]
# to [1917f33c694aff55fe7253f1a1dcb3dcb92edde8]
#
# patch "packages/opie-irc/opie-irc_1.2.3.bb"
# from [7c1584e98f129223f4252c85d691413f5ade1ec5]
# to [c4b837cfd973ef9166c1d40ef456df935a8807a3]
#
# patch "packages/opie-irc/opie-irc_cvs.bb"
# from [cee4fec93573b3ece698d3fd00fb8ebb408da7e8]
# to [a9a04d935da27288823d2c6ff1bc605bb7ec11ed]
#
# patch "packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb"
# from [6926e921975f4064b4bf5b6e4030f8afc98652cb]
# to [13c0bde7a606ffbf475967b7990ea82a22247655]
#
============================================================
--- conf/distro/sharprom-compatible.conf dddff62a6004aa3bd797558e337f219b7a2ec7af
+++ conf/distro/sharprom-compatible.conf 1917f33c694aff55fe7253f1a1dcb3dcb92edde8
@@ -37,7 +37,7 @@ PREFERRED_PROVIDER_virtual/arm-linux-gcc
PREFERRED_PROVIDER_virtual/arm-linux-binutils = "sharprom-toolchain-native"
PREFERRED_PROVIDER_virtual/libc = "sharprom-toolchain-native"
PREFERRED_PROVIDER_virtual/arm-linux-gcc = "sharprom-toolchain-native"
-PREFERRED_PROVIDER_virtual/linux-libc-headers = "sharprom-toolchain-native"
+PREFERRED_PROVIDER_virtual/linux-libc-headers = "linux-libc-headers"
PREFERRED_PROVIDER_virtual/arm-linux-gcc-initial = "sharprom-toolchain-native"
PREFERRED_VERSION_glibc = "2.2.5"
============================================================
--- packages/opie-irc/opie-irc_1.2.3.bb 7c1584e98f129223f4252c85d691413f5ade1ec5
+++ packages/opie-irc/opie-irc_1.2.3.bb c4b837cfd973ef9166c1d40ef456df935a8807a3
@@ -1,10 +1,8 @@ require ${PN}.inc
require ${PN}.inc
-PR = "r0"
+PR = "r1"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opieirc \
${HANDHELDS_CVS};tag=${TAG};module=opie/help \
${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
- ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
- file://utf8.patch;patch=1 \
- file://utf8-topic.patch;patch=1 "
============================================================
--- packages/opie-irc/opie-irc_cvs.bb cee4fec93573b3ece698d3fd00fb8ebb408da7e8
+++ packages/opie-irc/opie-irc_cvs.bb a9a04d935da27288823d2c6ff1bc605bb7ec11ed
@@ -1,11 +1,9 @@ PV = "${OPIE_CVS_PV}"
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
-PR = "r2"
+PR = "r3"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opieirc \
${HANDHELDS_CVS};module=opie/help \
${HANDHELDS_CVS};module=opie/apps \
+ ${HANDHELDS_CVS};module=opie/pics"
- ${HANDHELDS_CVS};module=opie/pics \
- file://utf8.patch;patch=1 \
- file://utf8-topic.patch;patch=1 "
============================================================
--- packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb 6926e921975f4064b4bf5b6e4030f8afc98652cb
+++ packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb 13c0bde7a606ffbf475967b7990ea82a22247655
@@ -1,6 +1,8 @@ SECTION = "base"
DESCRIPTION = "Precompiled SharpROM toolchain glue package"
LICENSE = "GPL"
SECTION = "base"
+# see bug 2199 for the reason the following line is in here
+DEPENDS = "virtual/linux-libc-headers"
PROVIDES_sharprom-compatible = "\
virtual/arm-linux-gcc-2.95 \
virtual/arm-linux-libc-for-gcc \
#
# mt diff -re65ed9e5ef27495a6e0a27b271aaeb16c87cc317 -ra50ff76c6f7f099d4944b622fd429d3d37da3875
#
#
#
# add_dir "packages/busybox/busybox-1.9.1"
#
# add_file "packages/busybox/busybox_1.9.1.bb"
# content [c8311698ef9ec25768ea49185d010c66448e5a0d]
#
# patch "conf/distro/include/preferred-om-2008-versions.inc"
# from [4265df09ea998b6dc3eb792e049be33b09147882]
# to [ebf743b8e6427e99a80a69e6d3b9c91f88e89d8d]
#
# patch "packages/busybox/busybox-1.7.2/defconfig"
# from [1b817a040175f1743b843c14af87276af8dcfdff]
# to [302bb125b48c659e36990a60ce62686437da9ab4]
#
# patch "packages/busybox/busybox_1.7.2.bb"
# from [c8c69ef36216408dc67cc3ed0cee0e19674a311e]
# to [61b05f11ad827e5fe65f8b8140b7933dd41d915b]
#
# patch "packages/python/python_2.5.1.bb"
# from [6d27b00bf376c2bb92ca2334ea83cc13b1d06aa0]
# to [06d728d5c77de9872867236d0f3de020ed8b79f1]
#
============================================================
--- packages/busybox/busybox_1.9.1.bb c8311698ef9ec25768ea49185d010c66448e5a0d
+++ packages/busybox/busybox_1.9.1.bb c8311698ef9ec25768ea49185d010c66448e5a0d
@@ -0,0 +1,112 @@
+require busybox.inc
+PR = "r0"
+
+SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
+ file://busybox-cron \
+ file://busybox-httpd \
+ file://busybox-udhcpd \
+ file://default.script \
+ file://hwclock.sh \
+ file://mount.busybox \
+ file://syslog \
+ file://syslog.conf \
+ file://udhcpscript.patch;patch=1 \
+ file://umount.busybox \
+ file://run_parts.c \
+ file://defconfig"
+
+EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
+
+do_configure () {
+ cp ${WORKDIR}/run_parts.c ${S}/debianutils/
+ install -m 0644 ${WORKDIR}/defconfig ${S}/.config
+ cml1_do_configure
+}
+
+do_compile () {
+ unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+ base_do_compile
+}
+
+do_install () {
+ unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+ install -d ${D}${sysconfdir}/init.d
+ oe_runmake "PREFIX=${D}" install
+ cp -pPR ${S}/_install/* ${D}/
+
+ # Move everything to /busybox (not supposed to end up in any package)
+ install -d ${D}/busybox
+ ls ${D} -R
+
+ cp -dPr ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ${D}/busybox/
+ # Move the busybox binary back to /bin
+ install -d ${D}${base_bindir}
+ mv ${D}/busybox${base_bindir}/busybox ${D}${base_bindir}/
+ # Move back the sh symlink
+ test -h ${D}/busybox${base_bindir}/sh && mv ${D}/busybox${base_bindir}/sh ${D}${base_bindir}/
+
+ install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/
+ install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/
+ if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
+ # Move crond back to /usr/sbin/crond
+ install -d ${D}${sbindir}
+ mv ${D}/busybox${sbindir}/crond ${D}${sbindir}/
+
+ install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/
+ fi
+ if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then
+ # Move httpd back to /usr/sbin/httpd
+ install -d ${D}${sbindir}
+ mv ${D}/busybox${sbindir}/httpd ${D}${sbindir}/
+
+ install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/
+ install -d ${D}/srv/www
+ fi
+ if grep "CONFIG_APP_UDHCPD=y" ${WORKDIR}/defconfig; then
+ # Move udhcpd back to /usr/sbin/udhcpd
+ install -d ${D}${sbindir}
+ mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/
+
+ install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/
+ fi
+ if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then
+ # Move hwclock back to /sbin/hwclock
+ install -d ${D}${base_sbindir}
+ mv ${D}/busybox${base_sbindir}/hwclock ${D}${base_sbindir}/
+
+ install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
+ fi
+ if grep "CONFIG_APP_UDHCPC=y" ${WORKDIR}/defconfig; then
+ # Move dhcpc back to /usr/sbin/udhcpc
+ install -d ${D}${base_sbindir}
+ mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/
+
+ install -d ${D}${sysconfdir}/udhcpc.d
+ install -d ${D}${datadir}/udhcpc
+ install -m 0755 ${S}/examples/udhcp/simple.script ${D}${sysconfdir}/udhcpc.d/50default
+ install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script
+ fi
+
+ install -m 0644 ${S}/busybox.links ${D}${sysconfdir}
+}
+
+pkg_prerm_${PN} () {
+ # This is so you can make busybox commit suicide - removing busybox with no other packages
+ # providing its files, this will make update-alternatives work, but the update-rc.d part
+ # for syslog, httpd and/or udhcpd will fail if there is no other package providing sh
+ tmpdir=`mktemp -d /tmp/busyboxrm-XXXXXX`
+ ln -s /bin/busybox $tmpdir/[
+ ln -s /bin/busybox $tmpdir/test
+ ln -s /bin/busybox $tmpdir/head
+ ln -s /bin/busybox $tmpdir/sh
+ ln -s /bin/busybox $tmpdir/basename
+ ln -s /bin/busybox $tmpdir/echo
+ ln -s /bin/busybox $tmpdir/mv
+ ln -s /bin/busybox $tmpdir/ln
+ ln -s /bin/busybox $tmpdir/dirname
+ ln -s /bin/busybox $tmpdir/rm
+ ln -s /bin/busybox $tmpdir/sed
+ ln -s /bin/busybox $tmpdir/sort
+ export PATH=$PATH:$tmpdir
+ while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; sh /usr/bin/update-alternatives --remove $bn $to; done </etc/busybox.links
+}
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc 4265df09ea998b6dc3eb792e049be33b09147882
+++ conf/distro/include/preferred-om-2008-versions.inc ebf743b8e6427e99a80a69e6d3b9c91f88e89d8d
@@ -1,5 +1,5 @@ PREFERRED_VERSION_dbus = "1.1.4"
PREFERRED_VERSION_dbus = "1.1.4"
-PREFERRED_VERSION_busybox = "1.7.2"
+PREFERRED_VERSION_busybox = "1.9.1"
PREFERRED_VERSION_gst-pulse = "0.9.7"
PREFERRED_VERSION_libtool = "1.2.14"
PREFERRED_VERSION_pulseaudio = "0.9.9"
============================================================
--- packages/busybox/busybox-1.7.2/defconfig 1b817a040175f1743b843c14af87276af8dcfdff
+++ packages/busybox/busybox-1.7.2/defconfig 302bb125b48c659e36990a60ce62686437da9ab4
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.7.2
-# Mon Feb 4 10:11:39 2008
+# Wed Feb 13 13:31:37 2008
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -73,7 +73,7 @@ CONFIG_FEATURE_EDITING_MAX_LEN=1024
# CONFIG_FEATURE_ETC_NETWORKS is not set
CONFIG_FEATURE_EDITING=y
CONFIG_FEATURE_EDITING_MAX_LEN=1024
-CONFIG_FEATURE_EDITING_FANCY_KEYS=y
+# CONFIG_FEATURE_EDITING_FANCY_KEYS is not set
# CONFIG_FEATURE_EDITING_VI is not set
CONFIG_FEATURE_EDITING_HISTORY=15
CONFIG_FEATURE_EDITING_SAVEHISTORY=y
@@ -143,7 +143,7 @@ CONFIG_DATE=y
CONFIG_CP=y
CONFIG_CUT=y
CONFIG_DATE=y
-CONFIG_FEATURE_DATE_ISOFMT=y
+# CONFIG_FEATURE_DATE_ISOFMT is not set
CONFIG_DD=y
CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
# CONFIG_FEATURE_DD_IBS_OBS is not set
@@ -281,7 +281,7 @@ CONFIG_RUN_PARTS=y
CONFIG_MKTEMP=y
# CONFIG_PIPE_PROGRESS is not set
CONFIG_RUN_PARTS=y
-CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
+# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
CONFIG_START_STOP_DAEMON=y
CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
@@ -370,29 +370,29 @@ CONFIG_XARGS=y
# CONFIG_FEATURE_SHADOWPASSWDS is not set
# CONFIG_USE_BB_SHADOW is not set
# CONFIG_USE_BB_PWD_GRP is not set
-# CONFIG_ADDGROUP is not set
-# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
-# CONFIG_DELGROUP is not set
-# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
-# CONFIG_ADDUSER is not set
-# CONFIG_DELUSER is not set
-# CONFIG_GETTY is not set
+CONFIG_ADDGROUP=y
+CONFIG_FEATURE_ADDUSER_TO_GROUP=y
+CONFIG_DELGROUP=y
+CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
+CONFIG_ADDUSER=y
+CONFIG_DELUSER=y
+CONFIG_GETTY=y
CONFIG_FEATURE_UTMP=y
-# CONFIG_FEATURE_WTMP is not set
-# CONFIG_LOGIN is not set
+CONFIG_FEATURE_WTMP=y
+CONFIG_LOGIN=y
# CONFIG_PAM is not set
# CONFIG_LOGIN_SCRIPTS is not set
-# CONFIG_FEATURE_NOLOGIN is not set
-# CONFIG_FEATURE_SECURETTY is not set
-# CONFIG_PASSWD is not set
-# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
+CONFIG_FEATURE_NOLOGIN=y
+CONFIG_FEATURE_SECURETTY=y
+CONFIG_PASSWD=y
+CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
# CONFIG_CRYPTPW is not set
# CONFIG_CHPASSWD is not set
-# CONFIG_SU is not set
-# CONFIG_FEATURE_SU_SYSLOG is not set
-# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
+CONFIG_SU=y
+CONFIG_FEATURE_SU_SYSLOG=y
+CONFIG_FEATURE_SU_CHECKS_SHELLS=y
# CONFIG_SULOGIN is not set
-# CONFIG_VLOCK is not set
+CONFIG_VLOCK=y
#
# Linux Ext2 FS Progs
============================================================
--- packages/busybox/busybox_1.7.2.bb c8c69ef36216408dc67cc3ed0cee0e19674a311e
+++ packages/busybox/busybox_1.7.2.bb 61b05f11ad827e5fe65f8b8140b7933dd41d915b
@@ -1,5 +1,5 @@ require busybox.inc
require busybox.inc
-PR = "r6"
+PR = "r8"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
file://busybox-cron \
============================================================
--- packages/python/python_2.5.1.bb 6d27b00bf376c2bb92ca2334ea83cc13b1d06aa0
+++ packages/python/python_2.5.1.bb 06d728d5c77de9872867236d0f3de020ed8b79f1
@@ -7,7 +7,7 @@ DEPENDS_sharprom = "python-native readli
DEPENDS_sharprom = "python-native readline zlib gdbm openssl"
# NOTE: Keep the digit in sync with BASEREV in contrib/generate-manifest-2.5.py
-PR = "ml8"
+PR = "ml9"
PYTHON_MAJMIN = "2.5"
@@ -103,3 +103,5 @@ FILES_python-man = "${datadir}/man"
PACKAGES += "python-man"
FILES_python-man = "${datadir}/man"
+PACKAGES_DYNAMIC += "python-ncurses"
+
More information about the Openembedded-commits
mailing list