Merge bk://openembedded@openembedded.bkbits.net/packages

into gandalf.tm.informatik.uni-frankfurt.de:/usr/local/projects/packages

2004/03/31 12:27:56-05:00 mine.nu!erich
Merge openembedded@openembedded.bkbits.net:packages
into erichl.mine.nu:/home/erich/src/packages

2004/03/31 12:27:35-05:00 mine.nu!erich
pango_1.2.5.oe, gtk+_2.2.4.oe:
  pango_1.2.5.oe, gtk+_2.2.4.oe fixes from pb_

2004/03/31 19:26:09+02:00 de[mickey]!mickey
packages-patch-20040331

BKrev: 406b05feE_NWQ67K3z6ZwOtzB3rumg

diff --git a/base-files/base-files_3.0.14.oe b/base-files/base-files_3.0.14.oe
index e69de29..9adff46 100644 (file)
--- a/base-files/base-files_3.0.14.oe
+++ b/base-files/base-files_3.0.14.oe
@@ -0,0 +1,40 @@
+SRC_URI = "${DEBIAN_MIRROR}/main/b/base-files/base-files_${PV}.tar.gz"
+DESCRIPTION = "Base system miscellaneous files."
+
+docdir_append = "/${P}"
+PACKAGES = "base-files"
+FILES_${PN} := "*"
+
+do_install () {
+       install -d ${D}/${docdir}
+       install -d ${D}${datadir}/${PN}
+       install -p -m 644 debian/changelog debian/FAQ \
+               debian/README.FHS debian/README.base ${D}/${docdir}/
+       cat debian/copyright.in | sed -e "s&#OSNAME#&${TARGET_OS}&g" \
+               > ${docdir}/copyright
+       install -m 755 debian/remove-base ${docdir}
+#      cd debian && install -m 755 preinst postinst ${D}/DEBIAN
+#      cd debian && install -m 644 conffiles ${D}/DEBIAN
+       ( cd ${D} && install -d `cat ${S}/debian/directory-list` )
+       install -p -m 644 share/* ${D}${datadir}/base-files
+       install -p -m 644 licenses/* ${D}${datadir}/common-licenses
+       ln -s LGPL-2.1 ${D}${datadir}/common-licenses/LGPL
+       ln -s GPL-2    ${D}${datadir}/common-licenses/GPL
+       install -p -m 644 `ls etc/|grep -v debian` ${D}/etc
+       rm -f ${D}/etc/motd
+       cat etc/motd | sed -e "s&#OSNAME#&${TARGET_OS}&g" > ${D}${datadir}/base-files/motd
+       cat share/info.dir | sed -e "s&#OSNAME#&${TARGET_OS}&g" > ${D}${datadir}/base-files/info.dir
+       gzip -9 ${docdir}/changelog
+#      chown -R root:root ${D}
+#      cd ${D} && chown root:src     usr/src
+#      cd ${D} && chown root:staff   var/local
+#      cd ${D} && chown root:staff   home
+       cd ${D} && chmod 755  `find . -type d`
+       cd ${D} && chmod 1777 `cat ${S}/debian/1777-dirs`
+       cd ${D} && chmod 2775 `cat ${S}/debian/2775-dirs`
+
+       install -d ${D}/${sysconfdir}
+       oe_machinstall -m 0644 ${FILESDIR}/fstab ${D}/${sysconfdir}/fstab
+       oe_machinstall -m 0644 ${FILESDIR}/hostname ${D}/${sysconfdir}/hostname
+       oe_machinstall -m 0644 ${FILESDIR}/profile ${D}/${sysconfdir}/profile
+}

diff --git a/base-passwd/base-passwd_3.5.7.oe b/base-passwd/base-passwd_3.5.7.oe
index 98b86c5..877b50a 100644 (file)
--- a/base-passwd/base-passwd_3.5.7.oe
+++ b/base-passwd/base-passwd_3.5.7.oe
@@ -47,12 +47,12 @@ pkg_postinst () {
 #              exit 0
 #      fi
 
-       if [ ! -e ${D}/${sysconfdir}/passwd ] ; then
-               cp ${D}/${datadir}/base-passwd/passwd.master ${D}/${sysconfdir}/passwd
+       if [ ! -e $D/${sysconfdir}/passwd ] ; then
+               cp $D/${datadir}/base-passwd/passwd.master $D/${sysconfdir}/passwd
        fi
        
-       if [ ! -e ${D}/${sysconfdir}/group ] ; then
-               cp ${D}/${datadir}/base-passwd/group.master ${D}/${sysconfdir}/group
+       if [ ! -e $D/${sysconfdir}/group ] ; then
+               cp $D/${datadir}/base-passwd/group.master $D/${sysconfdir}/group
        fi
        
 #      if ! [ -x ${sbindir}/update-passwd ]; then

diff --git a/gcc/gcc-initial-cross_3.3.3.oe b/gcc/gcc-initial-cross_3.3.3.oe
index 4f9cb6d..804e709 100644 (file)
--- a/gcc/gcc-initial-cross_3.3.3.oe
+++ b/gcc/gcc-initial-cross_3.3.3.oe
@@ -19,3 +19,8 @@ do_stage_prepend () {
        mkdir -p ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/${PV}
        ln -sf libgcc.a ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/${PV}/libgcc_eh.a
 }
+
+# Override the method from gcc-cross so we don't try to install libgcc
+do_install () {
+       oe_runmake 'DESTDIR=${D}' install
+}

diff --git a/gtk+/gtk+_2.2.4.oe b/gtk+/gtk+_2.2.4.oe
index 3ebff63..64bdd74 100644 (file)
--- a/gtk+/gtk+_2.2.4.oe
+++ b/gtk+/gtk+_2.2.4.oe
@@ -68,8 +68,8 @@ do_stage () {
        install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DIR}/share/aclocal/
 }
 
-python do_package () {
-       import string
+python populate_packages_prepend () {
+       import string, os
        def do_split(root, pattern, format, description, postinst):
                dvar = oe.data.getVar('D', d, 1)
                if not dvar:
@@ -110,6 +110,4 @@ python do_package () {
 
        do_split(loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
        do_split(immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules')
-
-       oe.build.exec_func("package_do_package", d)
 }

diff --git a/ipkg/ipkg-native_0.99.118.oe b/ipkg/ipkg-native_0.99.118.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/pango/pango_1.2.5.oe b/pango/pango_1.2.5.oe
index db176f8..f023f15 100644 (file)
--- a/pango/pango_1.2.5.oe
+++ b/pango/pango_1.2.5.oe
@@ -29,8 +29,8 @@ do_stage () {
        install -m 0644 ${S}/pango/pango*.h ${STAGING_INCDIR}/pango/
 }
 
-python do_package () {
-       import string
+python populate_packages_prepend () {
+       import string, os
        def do_split(root, pattern, format, description, postinst):
                dvar = oe.data.getVar('D', d, 1)
                if not dvar:
@@ -69,6 +69,4 @@ python do_package () {
        modules_root = os.path.join(pango_libdir, 'modules')
 
        do_split(modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', 'pango-querymodules > /etc/pango/pango.modules')
-
-       oe.build.exec_func("package_do_package", d)
 }

diff --git a/sysvinit/sysvinit_2.85.oe b/sysvinit/sysvinit_2.85.oe
index fba08d8..de12ca9 100644 (file)
--- a/sysvinit/sysvinit_2.85.oe
+++ b/sysvinit/sysvinit_2.85.oe
@@ -59,7 +59,7 @@ pkg_postinst () {
 #      if [ -n "`which update-alternatives 2>/dev/null`" ]; then
 #              update-alternatives blah
 #      else
-               ln -sf sysvinit ${D}/sbin/init
+               ln -sf sysvinit $D/sbin/init
 #      fi
        exit 0
 }

diff --git a/xtst/xtst-cvs.oe b/xtst/xtst-cvs.oe
index 489a2d8..531a6fd 100644 (file)
--- a/xtst/xtst-cvs.oe
+++ b/xtst/xtst-cvs.oe
@@ -2,7 +2,7 @@ PV = "0.0cvs${CVSDATE}"
 SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "virtual/libc x11"
+DEPENDS = "virtual/libc x11 recordext"
 PROVIDES = "xtst"
 DESCRIPTION = "X Test Extension: client side library"