[oe-commits] org.oe.dev merge of '2f816f2a85616dc662369edb3108bdc9c2705e93'

rwhitby commit openembedded-commits at lists.openembedded.org
Thu Jun 21 17:30:06 UTC 2007


merge of '2f816f2a85616dc662369edb3108bdc9c2705e93'
     and 'e7a4d4e9a0961d043f5fdb44415c51c6b9fcd45e'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: af585eaf4c971b8d572ec4d7df0e1d8812690395
ViewMTN: http://monotone.openembedded.org/revision.psp?id=af585eaf4c971b8d572ec4d7df0e1d8812690395
Files:
1
packages/fis
packages/fis/files
packages/fis/files/fis.cc
packages/fis/fis_1.0.bb
packages/gnupg/gnupg-1.4.0
packages/gnupg/gnupg-1.4.0/15_free_caps.patch
packages/gnupg/gnupg-1.4.0/16_min_privileges.patch
packages/gnupg/gnupg-1.4.0/18_ca_po_update.patch
packages/gnupg/gnupg-1.4.0/21_strgutil_update.patch
packages/gnupg/gnupg2.inc
packages/gnupg/gnupg2_1.9.15.bb
packages/gpephone/gpe-applauncher-0.7/default-icon.patch
packages/ipkg/ipkg-0.99.153
packages/ipkg/ipkg-0.99.153/fix-bug1393.patch
packages/ipkg/ipkg-0.99.155
packages/ipkg/ipkg-0.99.155/upgrade-message-garbage.patch
packages/ipkg/ipkg-native_0.99.152.bb
packages/ipkg/ipkg-native_0.99.153.bb
packages/ipkg/ipkg-native_0.99.154.bb
packages/ipkg/ipkg-native_0.99.159.bb
packages/ipkg/ipkg_0.99.152.bb
packages/ipkg/ipkg_0.99.153.bb
packages/ipkg/ipkg_0.99.154.bb
packages/ipkg/ipkg_0.99.155.bb
packages/ipkg/ipkg_0.99.159.bb
packages/openmoko-apps/openmoko-keyboard_svn.bb
packages/openmoko-inputmethods/openmoko-keyboard_svn.bb
packages/coreutils/coreutils-6.0
packages/kazehakase
packages/openmoko-inputmethods
packages/redboot-utils
packages/shasum
packages/shasum/files
packages/coreutils/coreutils-6.0/man.patch
packages/coreutils/coreutils-6.0/oe-old-tools.patch
packages/coreutils/coreutils-6.0/onceonly.m4
packages/coreutils/coreutils-6.0/uptime-pow-lib.patch
packages/coreutils/coreutils-native_6.0.bb
packages/coreutils/coreutils_6.0.bb
packages/kazehakase/kazehakase_0.4.5.bb
packages/llvm/llvm-native_cvs.bb
packages/redboot-utils/fconfig_20060419.bb
packages/redboot-utils/fis_1.0.bb
packages/shasum/files/main.c
packages/shasum/files/mhash_sha256.h
packages/shasum/files/sha256.c
packages/shasum/shasum-native.bb
packages/shasum/shasum.inc
classes/base.bbclass
classes/openmoko-base.bbclass
classes/sanity.bbclass
packages/gtk-webcore/osb-jscore_svn.bb
packages/gtk-webcore/osb-nrcit_svn.bb
packages/gtk-webcore/osb-nrcore_svn.bb
packages/ipkg/files/is-processing.patch
packages/ipkg/ipkg_0.99.163.bb
packages/openmoko-apps/openmoko-messages_svn.bb
packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb
packages/qpf-fonts/qpf-unismall_1.0.0.bb
packages/tasks/task-slugos.bb
Diffs:

#
# mt diff -r2f816f2a85616dc662369edb3108bdc9c2705e93 -raf585eaf4c971b8d572ec4d7df0e1d8812690395
#
# 
# no changes
# 


#
# mt diff -re7a4d4e9a0961d043f5fdb44415c51c6b9fcd45e -raf585eaf4c971b8d572ec4d7df0e1d8812690395
#
# 
# 
# delete "packages/fis"
# 
# delete "packages/fis/files"
# 
# delete "packages/fis/files/fis.cc"
# 
# delete "packages/fis/fis_1.0.bb"
# 
# delete "packages/gnupg/gnupg-1.4.0"
# 
# delete "packages/gnupg/gnupg-1.4.0/15_free_caps.patch"
# 
# delete "packages/gnupg/gnupg-1.4.0/16_min_privileges.patch"
# 
# delete "packages/gnupg/gnupg-1.4.0/18_ca_po_update.patch"
# 
# delete "packages/gnupg/gnupg-1.4.0/21_strgutil_update.patch"
# 
# delete "packages/gnupg/gnupg2.inc"
# 
# delete "packages/gnupg/gnupg2_1.9.15.bb"
# 
# delete "packages/gpephone/gpe-applauncher-0.7/default-icon.patch"
# 
# delete "packages/ipkg/ipkg-0.99.153"
# 
# delete "packages/ipkg/ipkg-0.99.153/fix-bug1393.patch"
# 
# delete "packages/ipkg/ipkg-0.99.155"
# 
# delete "packages/ipkg/ipkg-0.99.155/upgrade-message-garbage.patch"
# 
# delete "packages/ipkg/ipkg-native_0.99.152.bb"
# 
# delete "packages/ipkg/ipkg-native_0.99.153.bb"
# 
# delete "packages/ipkg/ipkg-native_0.99.154.bb"
# 
# delete "packages/ipkg/ipkg-native_0.99.159.bb"
# 
# delete "packages/ipkg/ipkg_0.99.152.bb"
# 
# delete "packages/ipkg/ipkg_0.99.153.bb"
# 
# delete "packages/ipkg/ipkg_0.99.154.bb"
# 
# delete "packages/ipkg/ipkg_0.99.155.bb"
# 
# delete "packages/ipkg/ipkg_0.99.159.bb"
# 
# rename "packages/openmoko-apps/openmoko-keyboard_svn.bb"
#     to "packages/openmoko-inputmethods/openmoko-keyboard_svn.bb"
# 
# add_dir "packages/coreutils/coreutils-6.0"
# 
# add_dir "packages/kazehakase"
# 
# add_dir "packages/openmoko-inputmethods"
# 
# add_dir "packages/redboot-utils"
# 
# add_dir "packages/shasum"
# 
# add_dir "packages/shasum/files"
# 
# add_file "packages/coreutils/coreutils-6.0/man.patch"
#  content [ff9a0d70eeec7f93c6cb9393b93f49dbe419d614]
# 
# add_file "packages/coreutils/coreutils-6.0/oe-old-tools.patch"
#  content [5e1c061ef0376cb044cadcd22255d0c7662d377f]
# 
# add_file "packages/coreutils/coreutils-6.0/onceonly.m4"
#  content [69e404272e41c22d678b6f84de2f8fff23347fcc]
# 
# add_file "packages/coreutils/coreutils-6.0/uptime-pow-lib.patch"
#  content [0a6a6c59fa7945fdb5223281929cbdcc499df660]
# 
# add_file "packages/coreutils/coreutils-native_6.0.bb"
#  content [6404ab2a1ae4487b3b190cd9efa252a23403c068]
# 
# add_file "packages/coreutils/coreutils_6.0.bb"
#  content [919b6e0740198c720d96ff32ad423154ed8d0c81]
# 
# add_file "packages/gpephone/gpe-applauncher-0.7/default-icon.patch"
#  content [617c1a28afead25aa7b0b6b40d7beb5a35e6470c]
# 
# add_file "packages/kazehakase/kazehakase_0.4.5.bb"
#  content [2e14bb25ffbd6926f5a10ff4eb9a140996a469c3]
# 
# add_file "packages/llvm/llvm-native_cvs.bb"
#  content [2dc12cc7ec6329a8a3655a535b04f5c97a2bc014]
# 
# add_file "packages/redboot-utils/fconfig_20060419.bb"
#  content [4471b7f09855c6df08168b8bdd33b76c1c672aa6]
# 
# add_file "packages/redboot-utils/fis_1.0.bb"
#  content [27930dbc581cd86aa735a57ceb640d813b33bd10]
# 
# add_file "packages/shasum/files/main.c"
#  content [221d8b89fce07412f18e09d23886d454333bcbc9]
# 
# add_file "packages/shasum/files/mhash_sha256.h"
#  content [eeefd6777d865b4383c56c98b3170b6a39349660]
# 
# add_file "packages/shasum/files/sha256.c"
#  content [b702ed4b876c55d38148bffde9f17816056df483]
# 
# add_file "packages/shasum/shasum-native.bb"
#  content [de9917e801d649c084c228e14590b5459be5d95e]
# 
# add_file "packages/shasum/shasum.inc"
#  content [95d01d5ab80c081175980b41f167722ba3396381]
# 
# patch "classes/base.bbclass"
#  from [c00c5a0bc606c6209272cc163bc4334e0a694b53]
#    to [a24e4e673608a40679457153103b591222ae0942]
# 
# patch "classes/openmoko-base.bbclass"
#  from [3c3bbdee3c7bd77df7aab943041fdb6eb9bd3742]
#    to [ad268b1283c424f167a62d88d466d50839c0b122]
# 
# patch "classes/sanity.bbclass"
#  from [5fcaa7e649d6a851bbd8d5d2b0a8c6105ba0f6fd]
#    to [c273e975d186528dba7730969296a3b06485722e]
# 
# patch "packages/gtk-webcore/osb-jscore_svn.bb"
#  from [297ef94e27628efa4805895a01afa50d5b8c732a]
#    to [f139758480873d7adc079d2004df99207d84612f]
# 
# patch "packages/gtk-webcore/osb-nrcit_svn.bb"
#  from [cbf7b4d4a3db19bbd7d355ac51bd2a5026fea41e]
#    to [bd9038b33a39347d8b14f9d564f160cd78a3bde7]
# 
# patch "packages/gtk-webcore/osb-nrcore_svn.bb"
#  from [d697a2a8b0422410529046ec743a6a655fab7294]
#    to [615cc2dbb7666b59d067cffc9ac20bdbc37e6004]
# 
# patch "packages/ipkg/files/is-processing.patch"
#  from [c9da3e2f77aa8941e0c4657bd924742120b17761]
#    to [477f43a03104fcfa524cc7d6032e9e7cc8e7943d]
# 
# patch "packages/ipkg/ipkg_0.99.163.bb"
#  from [8144839279887e46285491f7912e2887973a7fb9]
#    to [cd7517e70eb13ced53531ae54bda1c37ccfe42bb]
# 
# patch "packages/openmoko-apps/openmoko-messages_svn.bb"
#  from [7f3e6071299076f55f8011447f69eb19cb491487]
#    to [73dae0cee4d854f19c854e4d32d11d0c0f75a692]
# 
# patch "packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb"
#  from [e5f9b257dd86f3520321019792dd3b4d5db1e8bb]
#    to [98797e9e5d5270e9375a56ce3fa90b4d485e0ac1]
# 
# patch "packages/openmoko-inputmethods/openmoko-keyboard_svn.bb"
#  from [a58d0aaa54d7785008982fe12956275edfdc64b1]
#    to [d907df3d45fbb7c7c83f72701cc0512eed2cfc7e]
# 
# patch "packages/qpf-fonts/qpf-unismall_1.0.0.bb"
#  from [503ae7561a70cf10cdb310a2a6ecf56dc40f0dd5]
#    to [741c55eb9c92ef7b6cdcbb362c71275e527da262]
# 
# patch "packages/tasks/task-slugos.bb"
#  from [95960d2112da74b840992625901b634a55408fee]
#    to [8fd4cf3466a337ddf8957485b2c891ebe74a59b3]
# 
============================================================
--- packages/coreutils/coreutils-6.0/man.patch	ff9a0d70eeec7f93c6cb9393b93f49dbe419d614
+++ packages/coreutils/coreutils-6.0/man.patch	ff9a0d70eeec7f93c6cb9393b93f49dbe419d614
@@ -0,0 +1,42 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- coreutils-5.3.0/configure.ac~man
++++ coreutils-5.3.0/configure.ac
+@@ -237,6 +237,20 @@
+ AM_GNU_GETTEXT([external], [need-ngettext])
+ AM_GNU_GETTEXT_VERSION(0.13.1)
+ 
++AC_MSG_CHECKING([whether to build man pages])
++AC_ARG_WITH(manpages, 
++	AS_HELP_STRING([--with-manpages],
++		[Enable building of manpages (default=yes)]),
++	[cu_cv_build_manpages=$enableval],
++	[cu_cv_build_manpages=yes])
++# help2man doesn't work when crosscompiling, as it needs to run the
++# binary that was built.
++if test x"$cross_compiling" = x"yes"; then
++  cu_cv_build_manpages=no
++fi
++AC_MSG_RESULT($cu_cv_build_manpages)
++AM_CONDITIONAL(ENABLE_MANPAGES, test x"$cu_cv_build_manpages" = x"yes")
++
+ AC_CONFIG_FILES(
+   Makefile
+   doc/Makefile
+--- coreutils-5.3.0/Makefile.am~man
++++ coreutils-5.3.0/Makefile.am
+@@ -1,6 +1,11 @@
+ ## Process this file with automake to produce Makefile.in -*-Makefile-*-
+ 
++if ENABLE_MANPAGES
+ SUBDIRS = lib src doc man po tests
++else
++SUBDIRS = lib src doc po tests
++endif
++
+ EXTRA_DIST = Makefile.cfg Makefile.maint GNUmakefile \
+   .kludge-stamp .prev-version THANKS-to-translators THANKStt.in \
+   .x-sc_space_tab .x-sc_sun_os_names \
============================================================
--- packages/coreutils/coreutils-6.0/oe-old-tools.patch	5e1c061ef0376cb044cadcd22255d0c7662d377f
+++ packages/coreutils/coreutils-6.0/oe-old-tools.patch	5e1c061ef0376cb044cadcd22255d0c7662d377f
@@ -0,0 +1,26 @@
+Index: coreutils-6.0/configure.ac
+===================================================================
+--- coreutils-6.0.orig/configure.ac	2007-04-02 11:21:27.000000000 +0200
++++ coreutils-6.0/configure.ac	2007-04-02 11:21:36.000000000 +0200
+@@ -26,7 +26,7 @@
+ AC_CONFIG_HEADERS([config.h:config.hin])
+ 
+ AB_INIT()
+-AM_INIT_AUTOMAKE([1.9.6 gnits dist-bzip2])
++AM_INIT_AUTOMAKE([1.9.3 gnits dist-bzip2])
+ 
+ gl_DEFAULT_POSIX2_VERSION
+ gl_USE_SYSTEM_EXTENSIONS
+Index: coreutils-6.0/m4/jm-macros.m4
+===================================================================
+--- coreutils-6.0.orig/m4/jm-macros.m4	2007-04-02 11:21:54.000000000 +0200
++++ coreutils-6.0/m4/jm-macros.m4	2007-04-02 11:22:02.000000000 +0200
+@@ -23,7 +23,7 @@
+ 
+ AC_DEFUN([gl_MACROS],
+ [
+-  AC_PREREQ(2.60)
++  AC_PREREQ(2.59)
+ 
+   GNU_PACKAGE="GNU $PACKAGE"
+   AC_DEFINE_UNQUOTED(GNU_PACKAGE, "$GNU_PACKAGE",
============================================================
--- packages/coreutils/coreutils-6.0/onceonly.m4	69e404272e41c22d678b6f84de2f8fff23347fcc
+++ packages/coreutils/coreutils-6.0/onceonly.m4	69e404272e41c22d678b6f84de2f8fff23347fcc
@@ -0,0 +1,63 @@
+# onceonly.m4 serial 3
+dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl This file defines some "once only" variants of standard autoconf macros.
+dnl   AC_CHECK_HEADERS_ONCE         like  AC_CHECK_HEADERS
+dnl   AC_CHECK_FUNCS_ONCE           like  AC_CHECK_FUNCS
+dnl   AC_CHECK_DECLS_ONCE           like  AC_CHECK_DECLS
+dnl   AC_REQUIRE([AC_HEADER_STDC])  like  AC_HEADER_STDC
+dnl The advantage is that the check for each of the headers/functions/decls
+dnl will be put only once into the 'configure' file. It keeps the size of
+dnl the 'configure' file down, and avoids redundant output when 'configure'
+dnl is run.
+dnl The drawback is that the checks cannot be conditionalized. If you write
+dnl   if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi
+dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to
+dnl empty, and the check will be inserted before the body of the AC_DEFUNed
+dnl function.
+
+dnl Autoconf version 2.57 or newer is recommended.
+AC_PREREQ(2.54)
+
+# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of
+# AC_CHECK_HEADERS(HEADER1 HEADER2 ...).
+AC_DEFUN([AC_CHECK_HEADERS_ONCE], [
+  :
+  AC_FOREACH([gl_HEADER_NAME], [$1], [
+    AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(defn([gl_HEADER_NAME]),
+                                                 [-./], [___])), [
+      AC_CHECK_HEADERS(gl_HEADER_NAME)
+    ])
+    AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME,
+                                                   [-./], [___])))
+  ])
+])
+
+# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of
+# AC_CHECK_FUNCS(FUNC1 FUNC2 ...).
+AC_DEFUN([AC_CHECK_FUNCS_ONCE], [
+  :
+  AC_FOREACH([gl_FUNC_NAME], [$1], [
+    AC_DEFUN([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]), [
+      AC_CHECK_FUNCS(defn([gl_FUNC_NAME]))
+    ])
+    AC_REQUIRE([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]))
+  ])
+])
+
+# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of
+# AC_CHECK_DECLS(DECL1, DECL2, ...).
+AC_DEFUN([AC_CHECK_DECLS_ONCE], [
+  :
+  AC_FOREACH([gl_DECL_NAME], [$1], [
+    AC_DEFUN([gl_CHECK_DECL_]defn([gl_DECL_NAME]), [
+      AC_CHECK_DECLS(defn([gl_DECL_NAME]))
+    ])
+    AC_REQUIRE([gl_CHECK_DECL_]defn([gl_DECL_NAME]))
+  ])
+])
============================================================
--- packages/coreutils/coreutils-6.0/uptime-pow-lib.patch	0a6a6c59fa7945fdb5223281929cbdcc499df660
+++ packages/coreutils/coreutils-6.0/uptime-pow-lib.patch	0a6a6c59fa7945fdb5223281929cbdcc499df660
@@ -0,0 +1,11 @@
+--- coreutils-5.3.0/src/Makefile.am.orig	2005-09-27 22:34:35.659272058 -0700
++++ coreutils-5.3.0/src/Makefile.am	2005-09-27 22:34:39.403507668 -0700
+@@ -74,7 +74,7 @@
+ sleep_LDADD = $(nanosec_libs)
+ tail_LDADD = $(nanosec_libs)
+ 
+-uptime_LDADD = $(LDADD) $(GETLOADAVG_LIBS)
++uptime_LDADD = $(LDADD) $(POW_LIB) $(GETLOADAVG_LIBS)
+ 
+ su_LDADD = $(LDADD) $(LIB_CRYPT)
+ 
============================================================
--- packages/coreutils/coreutils-native_6.0.bb	6404ab2a1ae4487b3b190cd9efa252a23403c068
+++ packages/coreutils/coreutils-native_6.0.bb	6404ab2a1ae4487b3b190cd9efa252a23403c068
@@ -0,0 +1,7 @@
+SECTION = "base"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/coreutils-${PV}"
+S = "${WORKDIR}/coreutils-${PV}"
+
+require coreutils_${PV}.bb
+inherit native
============================================================
--- packages/coreutils/coreutils_6.0.bb	919b6e0740198c720d96ff32ad423154ed8d0c81
+++ packages/coreutils/coreutils_6.0.bb	919b6e0740198c720d96ff32ad423154ed8d0c81
@@ -0,0 +1,85 @@
+require coreutils.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \
+           file://man.patch;patch=1 \
+	   file://oe-old-tools.patch;patch=1 \
+	   file://onceonly.m4"
+
+# [ gets a special treatment and is not included in this
+bindir_progs = "basename cksum comm csplit cut dir dircolors dirname du \
+		env expand expr factor fmt fold groups head hostid id install \
+		join link logname md5sum mkfifo nice nl nohup od paste pathchk \
+		pinky pr printenv printf ptx readlink seq sha1sum shred sort \
+		split stat sum tac tail tee test tr tsort tty unexpand uniq \
+		unlink users vdir wc who whoami yes \
+		"
+
+# hostname gets a special treatment and is not included in this
+base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill \
+		     ln ls mkdir mknod mv pwd rm rmdir sleep stty sync touch \
+		     true uname \
+		     "
+
+sbindir_progs= "chroot"
+
+do_configure_prepend() {
+	install -m 0644 ${WORKDIR}/onceonly.m4 ${S}/m4
+}
+
+do_install () {
+	autotools_do_install
+
+	# Renaming the utilities that should go in /usr/bin
+	for i in ${bindir_progs}; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}; done
+
+	# Renaming and moving the utilities that should go in /bin (FHS)
+	install -d ${D}${base_bindir}
+	for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${PN}; done
+
+	# Renaming and moving the utilities that should go in /usr/sbin (FHS)
+	install -d ${D}${sbindir}
+	for i in ${sbindir_progs}; do mv ${D}${bindir}/$i ${D}${sbindir}/$i.${PN}; done
+
+	# [ requires special handling because [.coreutils will cause the sed stuff
+	# in update-alternatives to fail, therefore use lbracket - the name used
+	# for the actual source file.
+	mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${PN}
+	# hostname and uptime separated. busybox's versions are preferred
+	mv ${D}${bindir}/hostname ${D}${base_bindir}/hostname.${PN}
+	mv ${D}${bindir}/uptime ${D}${bindir}/uptime.${PN}
+
+}
+
+pkg_postinst_${PN} () {
+	# The utilities in /usr/bin
+	for i in ${bindir_progs}; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done
+
+	# The utilities in /bin
+	for i in ${base_bindir_progs}; do update-alternatives --install ${base_bindir}/$i $i $i.${PN} 100; done
+
+	# The utilities in /usr/sbin
+	for i in ${sbindir_progs}; do update-alternatives --install ${sbindir}/$i $i $i.${PN} 100; done
+
+	# Special cases. uptime and hostname is broken, prefer busybox's version. [ needs to be treated separately.
+	update-alternatives --install ${bindir}/uptime uptime uptime.${PN} 10
+	update-alternatives --install ${base_bindir}/hostname hostname hostname.${PN} 10
+	update-alternatives --install '${bindir}/[' '[' 'lbracket.${PN}' 100
+}
+
+pkg_prerm_${PN} () {
+	# The utilities in /usr/bin
+	for i in ${bindir_progs}; do update-alternatives --remove $i $i.${PN}; done
+
+	# The utilities in /bin
+	for i in ${base_bindir_progs}; do update-alternatives --remove $i $i.${PN}; done
+
+	# The utilities in /usr/sbin
+	for i in ${sbindir_progs}; do update-alternatives --remove $i $i.${PN}; done
+
+	# The special cases
+	update-alternatives --remove hostname hostname.${PN}
+	update-alternatives --remove uptime uptime.${PN}
+	update-alternatives --remove '[' 'lbracket.${PN}'
+}
============================================================
--- packages/gpephone/gpe-applauncher-0.7/default-icon.patch	617c1a28afead25aa7b0b6b40d7beb5a35e6470c
+++ packages/gpephone/gpe-applauncher-0.7/default-icon.patch	617c1a28afead25aa7b0b6b40d7beb5a35e6470c
@@ -0,0 +1,20 @@
+Index: applications.c
+===================================================================
+--- applications.c	(Revision 598)
++++ applications.c	(Arbeitskopie)
+@@ -463,8 +463,13 @@
+                                          applauncher_settings.themename ? applauncher_settings.themename : "default",
+                                          THEMEFOLDER, ICON_LOADING, NULL);
+               }
+-             
+-            g_print ("\nloading icon: %s\n", file);
++              
++            if (!g_file_test (file, G_FILE_TEST_EXISTS))
++              {
++       %s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list