From 355c32c9303e2e2ea3ca480cb424ddbef84bb5e4 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Wed, 16 Aug 2006 19:57:00 +0000 Subject: slugos-native: moved libc6-dev to the linux section as it is not for uclibc --- packages/meta/slugos-native.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/meta/slugos-native.bb b/packages/meta/slugos-native.bb index 7af7f7961a..e3988aa8a2 100644 --- a/packages/meta/slugos-native.bb +++ b/packages/meta/slugos-native.bb @@ -5,7 +5,7 @@ # DESCRIPTION = "Packages that are required for the SlugOS native build environment" LICENSE = "MIT" -PR = "r4" +PR = "r5" INHIBIT_DEFAULT_DEPS = "1" EXCLUDE_FROM_WORLD = "1" @@ -28,7 +28,6 @@ SLUGOS_NATIVE_RT = "\ gcc gcc-symlinks \ gdbm \ libstdc++-dev \ - libc6-dev \ ncurses-dev ncurses-terminfo \ perl perl-modules \ python-core python-crypt python-io python-lang python-pickle python-shell python-textutils \ @@ -37,6 +36,7 @@ SLUGOS_NATIVE_RT = "\ # Run-time and DEPENDS SLUGOS_NATIVE_prepend_linux = "\ + libc6-dev \ " SLUGOS_NATIVE_prepend_linux-uclibc = "\ libiconv \ -- cgit v1.2.3 From ceca77cf969f24603a0527cfdf1d3d99d43ec820 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Wed, 16 Aug 2006 20:01:15 +0000 Subject: slugos-packages.bb: demoted apr, boost, linphone, sudo for ucslugc promoted asterisk, asterisk-sounds, alsa-utils, ircp to common section as they also work for ucslugc. --- packages/meta/slugos-packages.bb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index ec42c59c64..60a23cd16d 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" MAINTAINER = "NSLU2 Linux " HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r11" +PR = "r12" CONFLICTS = "db3" PROVIDES += "${SLUGOS_IMAGENAME}-packages" @@ -14,11 +14,13 @@ EXCLUDE_FROM_WORLD = "1" INHIBIT_DEFAULT_DEPS = "1" ALLOW_EMPTY = 1 -# The list of packages to build for the ucslugc DISTRO. +# The list of packages to build for the slugos DISTRO. # KEEP IN ALPHABETICAL ORDER SLUGOS_PACKAGES = "\ alsa-lib \ - apr \ + alsa-utils \ + asterisk \ + asterisk-sounds \ atftp \ audiofile \ aumix \ @@ -31,7 +33,6 @@ SLUGOS_PACKAGES = "\ bison \ bluez-libs \ bluez-utils-nodbus \ - boost \ bridge-utils \ bwmon \ bzip2 \ @@ -77,6 +78,7 @@ SLUGOS_PACKAGES = "\ ifupdown \ ipkg-utils \ iptables \ + ircp \ joe \ jpeg \ lcdproc \ @@ -95,7 +97,6 @@ SLUGOS_PACKAGES = "\ libusb \ libvorbis \ libxml2 \ - linphone \ lirc \ lrzsz \ lsof \ @@ -154,7 +155,6 @@ SLUGOS_PACKAGES = "\ ssmtp \ strace \ streamripper \ - sudo \ sysfsutils \ syslog-ng \ tar \ @@ -199,11 +199,11 @@ UCLIBC_UNSUPPORTABLE_PACKAGES = "\ # These packages work with glibc, but break on uclibc. UCLIBC_BROKEN_PACKAGES = "\ - alsa-utils \ - asterisk \ - asterisk-sounds \ + apr \ bogofilter \ - ircp \ + boost \ + linphone \ + sudo \ " # Packages which build only with glibc (some of these use internal -- cgit v1.2.3 From 834056262ab80282aafcb5c7678af09f0e4e1d28 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sat, 19 Aug 2006 09:39:42 +0000 Subject: classes/tinderclient.bbclass: Send PF instead of only P As requested by Marcin include the PR of the built package as well. This is already included in the PF variable. --- classes/tinderclient.bbclass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass index 1c8079ebc9..d36ef0b343 100644 --- a/classes/tinderclient.bbclass +++ b/classes/tinderclient.bbclass @@ -240,8 +240,8 @@ def tinder_tinder_start(d, event): output.append( "---> TINDERBOX BUILDING '%(packages)s'" ) output.append( "<--- TINDERBOX STARTING BUILD NOW" ) - output.append( "" ) - + output.append( "" ) + return "\n".join(output) % vars() def tinder_do_tinder_report(event): @@ -311,13 +311,13 @@ def tinder_do_tinder_report(event): elif name == "TaskFailed": log += "<--- TINDERBOX Task %s failed (FAILURE)\n" % event.task elif name == "PkgStarted": - log += "---> TINDERBOX Package %s started\n" % data.getVar('P', event.data, True) + log += "---> TINDERBOX Package %s started\n" % data.getVar('PF', event.data, True) elif name == "PkgSucceeded": - log += "<--- TINDERBOX Package %s done (SUCCESS)\n" % data.getVar('P', event.data, True) + log += "<--- TINDERBOX Package %s done (SUCCESS)\n" % data.getVar('PF', event.data, True) elif name == "PkgFailed": if not data.getVar('TINDER_AUTOBUILD', event.data, True) == "0": build.exec_task('do_clean', event.data) - log += "<--- TINDERBOX Package %s failed (FAILURE)\n" % data.getVar('P', event.data, True) + log += "<--- TINDERBOX Package %s failed (FAILURE)\n" % data.getVar('PF', event.data, True) status = 200 # remember the failure for the -k case h = file(data.getVar('TMPDIR', event.data, True)+"/tinder-status", 'w') -- cgit v1.2.3 From 314d42583035aaf4bb5dfe7ff948875752739d3b Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sat, 19 Aug 2006 09:52:40 +0000 Subject: classes/icecc.bbclass: Remove tabs, use inherit_class to check if we build a native or cross package --- classes/icecc.bbclass | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/classes/icecc.bbclass b/classes/icecc.bbclass index 7dfcfc29a4..656cbe9d69 100644 --- a/classes/icecc.bbclass +++ b/classes/icecc.bbclass @@ -1,5 +1,5 @@ # IceCream distributed compiling support -# +# # We need to create a tar.bz2 of our toolchain and set # ICECC_VERSION, ICECC_CXX and ICEC_CC # @@ -13,7 +13,7 @@ def create_env(bb,d): # host prefix is empty (let us duplicate the query for ease) prefix = bb.data.expand('${HOST_PREFIX}', d) if len(prefix) == 0: - return "" + return "" import tarfile import socket @@ -28,12 +28,12 @@ def create_env(bb,d): name = socket.gethostname() try: - os.stat(ice_dir + '/' + target_sys + '/lib/ld-linux.so.2') - os.stat(ice_dir + '/' + target_sys + '/bin/g++') + os.stat(ice_dir + '/' + target_sys + '/lib/ld-linux.so.2') + os.stat(ice_dir + '/' + target_sys + '/bin/g++') except: - return "" + return "" - VERSION = '3.4.3' + VERSION = '3.4.3' cross_name = prefix + distro + target_sys + float +VERSION+ name tar_file = ice_dir + '/ice/' + cross_name + '.tar.bz2' @@ -41,10 +41,10 @@ def create_env(bb,d): os.stat(tar_file) return tar_file except: - try: - os.makedirs(ice_dir+'/ice') - except: - pass + try: + os.makedirs(ice_dir+'/ice') + except: + pass # FIXME find out the version of the compiler tar = tarfile.open(tar_file, 'w:bz2') @@ -102,15 +102,14 @@ def use_icc_version(bb,d): # Constin native native prefix = bb.data.expand('${HOST_PREFIX}', d) if len(prefix) == 0: - return "no" - - - native = bb.data.expand('${PN}', d) - blacklist = [ "-cross", "-native" ] + return "no" + + + blacklist = [ "cross", "native" ] for black in blacklist: - if black in native: - return "no" + if bb.data.inherits_class(black, d): + return "no" return "yes" @@ -118,13 +117,13 @@ def icc_path(bb,d,compile): native = bb.data.expand('${PN}', d) blacklist = [ "ulibc", "glibc", "ncurses" ] for black in blacklist: - if black in native: - return "" + if black in native: + return "" - if "-native" in native: - compile = False - if "-cross" in native: - compile = False + blacklist = [ "cross", "native" ] + for black in blacklist: + if bb.data.inherits_class(black, d): + compile = False prefix = bb.data.expand('${HOST_PREFIX}', d) if compile and len(prefix) != 0: @@ -151,6 +150,6 @@ do_compile_prepend() { export ICECC_CXX="${HOST_PREFIX}g++" if [ "${@use_icc_version(bb,d)}" = "yes" ]; then - export ICECC_VERSION="${@icc_version(bb,d)}" + export ICECC_VERSION="${@icc_version(bb,d)}" fi } -- cgit v1.2.3 From 821494d376ae549d48182380b8d4b5d92c913524 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sat, 19 Aug 2006 10:20:59 +0000 Subject: classes/icecc.bbclass: Determine version of gcc by executing it, use os.path.join to create paths --- classes/icecc.bbclass | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/classes/icecc.bbclass b/classes/icecc.bbclass index 656cbe9d69..658ccf3672 100644 --- a/classes/icecc.bbclass +++ b/classes/icecc.bbclass @@ -4,6 +4,14 @@ # ICECC_VERSION, ICECC_CXX and ICEC_CC # +def icc_determine_gcc_version(gcc): + """ + Hack to determine the version of GCC + + 'i686-apple-darwin8-gcc-4.0.1 (GCC) 4.0.1 (Apple Computer, Inc. build 5363)' + """ + return os.popen("%s --version" % gcc ).readline()[2] + def create_env(bb,d): """ Create a tar.bz of the current toolchain @@ -23,32 +31,31 @@ def create_env(bb,d): prefix = bb.data.expand('${HOST_PREFIX}' , d) distro = bb.data.expand('${DISTRO}', d) target_sys = bb.data.expand('${TARGET_SYS}', d) - #float = bb.data.getVar('${TARGET_FPU}', d) - float = "anyfloat" + float = bb.data.getVar('${TARGET_FPU}', d) or "hard" name = socket.gethostname() try: - os.stat(ice_dir + '/' + target_sys + '/lib/ld-linux.so.2') - os.stat(ice_dir + '/' + target_sys + '/bin/g++') + os.stat(os.path.join(ice_dir, target_sys, 'lib', 'ld-linux.so.2')) + os.stat(os.path.join(ice_dir, target_sys, 'bin', 'g++')) except: return "" - VERSION = '3.4.3' + VERSION = icc_determine_gcc_version( os.path.join(ice_dir,target_sys,"bin","g++") ) cross_name = prefix + distro + target_sys + float +VERSION+ name - tar_file = ice_dir + '/ice/' + cross_name + '.tar.bz2' + tar_file = os.path.join(ice_dir, 'ice', cross_name + '.tar.bz2') try: os.stat(tar_file) return tar_file except: try: - os.makedirs(ice_dir+'/ice') + os.makedirs(os.path.join(ice_dir,'ice')) except: pass # FIXME find out the version of the compiler tar = tarfile.open(tar_file, 'w:bz2') - tar.add(ice_dir + '/' + target_sys + '/lib/ld-linux.so.2', + tar.add(ice_dir + '/' + target_sys + '/lib/ld-linux.so.2', target_sys + 'cross/lib/ld-linux.so.2') tar.add(ice_dir + '/' + target_sys + '/lib/ld-linux.so.2', target_sys + 'cross/lib/ld-2.3.3.so') @@ -78,7 +85,7 @@ def create_path(compilers, type, bb, d): """ import os - staging = bb.data.expand('${STAGING_DIR}', d) + "/ice/" + type + staging = os.path.join(bb.data.expand('${STAGING_DIR}', d), "ice", type) icecc = bb.data.getVar('ICECC_PATH', d) # Create the dir if necessary @@ -89,7 +96,7 @@ def create_path(compilers, type, bb, d): for compiler in compilers: - gcc_path = staging + "/" + compiler + gcc_path = os.path.join(staging, compiler) try: os.stat(gcc_path) except: -- cgit v1.2.3 From 784225fada898f1b86cef4dcc20f53ff590889f3 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sat, 19 Aug 2006 17:56:50 +0000 Subject: ushare: created; ushare is a UPnP media server --- packages/ushare/.mtn2git_empty | 0 packages/ushare/ushare_0.9.7.bb | 10 ++++++++++ 2 files changed, 10 insertions(+) create mode 100644 packages/ushare/.mtn2git_empty create mode 100644 packages/ushare/ushare_0.9.7.bb diff --git a/packages/ushare/.mtn2git_empty b/packages/ushare/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/ushare/ushare_0.9.7.bb b/packages/ushare/ushare_0.9.7.bb new file mode 100644 index 0000000000..a922fed2d0 --- /dev/null +++ b/packages/ushare/ushare_0.9.7.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "ushare is a UPnP media server" +LICENSE = "GPL" +HOMEPAGE = "http://ushare.geexbox.org/" +MAINTAINER = "eFfeM " +DEPENDS = "libupnp" +SRC_URI = "http://ushare.geexbox.org/releases/ushare-0.9.7.tar.bz2" +S = "${WORKDIR}/ushare-${PV}" +PR = "r0" + +inherit autotools -- cgit v1.2.3 From 3713cf969e4073f08cc096f122032e9000674225 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sat, 19 Aug 2006 17:57:54 +0000 Subject: slugos-packages: added libupnp and ushare --- packages/meta/slugos-packages.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 60a23cd16d..241f999999 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -94,6 +94,7 @@ SLUGOS_PACKAGES = "\ libol \ libpng \ libtool \ + libupnp \ libusb \ libvorbis \ libxml2 \ @@ -162,6 +163,7 @@ SLUGOS_PACKAGES = "\ tiff \ unzip \ usbutils \ + ushare \ util-linux \ vim \ vlan \ -- cgit v1.2.3 From 9593a3c9d7f8f4f845f560d16fede668131beb14 Mon Sep 17 00:00:00 2001 From: Kristoffer Ericson Date: Sat, 19 Aug 2006 18:36:49 +0000 Subject: conf/distro/jlime-donkey.conf: Major cleanups and safe versions added * Updated safe versions for GPE,GTK,... * Cleaned up some typos, made generally cleaner --- conf/distro/jlime-donkey.conf | 94 +++++++++++++++++++++++++++++-------------- 1 file changed, 63 insertions(+), 31 deletions(-) diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index 3bff27763d..8375996133 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -8,33 +8,40 @@ DISTRO_VERSION = "donkey" export FEED_URLS_jlime = "donkey##http://donkey-${ARCH}.jlime.com" -# No uniroot +#<>-----------------------------------------------------------------> +#<> No uniroot +#<>-----------------------------------------------------------------< PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" -#<> + +#<>-----------------------------------------------------------------> #<> We will set CVS DATE when things are known to work. -#<> +#<>-----------------------------------------------------------------< PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" + +#<>-----------------------------------------------------------------> #<> We want this so we can crosscompile the kernel using gcc 3.4.3 #<> Also, select version of modules (and kernel) -#<> +#<>-----------------------------------------------------------------< PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-3.4.4:gcc-cross-kernel" PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-${MACHINE}" -#<> + +#<>-----------------------------------------------------------------> #<>We want kdrive as our default X-Server. -#<> +#<>-----------------------------------------------------------------< PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/libx11 = "libx11" +require conf/distro/include/preferred-xorg-versions-X11R7.1.inc -#<> +#<>-----------------------------------------------------------------> #<>Setting Preferred Binutils,gcc,glibc and linux-libc-headers -#<> +#<>-----------------------------------------------------------------< PREFERRED_VERSION_binutils = "2.17" PREFERRED_VERSION_binutils-cross = "2.17" PREFERRED_VERSION_binutils-cross-sdk = "2.16.91.0.7" @@ -44,76 +51,101 @@ PREFERRED_VERSION_gcc-cross-initial = "4.1.1" PREFERRED_VERSION_linux-libc-headers = "2.6.15.99" PREFERRED_VERSION_glibc = "2.4" PREFERRED_VERSION_glibc-intermediate = "2.4" -require conf/distro/include/preferred-xorg-versions-X11R7.1.inc -#<> -#<>Setting Preferred glib-2.0,glib-1.2 -#<> +#<>------------------------------------------------------------------> +#<>Setting Preferred glib, dbus, db-native +#<>------------------------------------------------------------------< PREFERRED_VERSION_glib-2.0-native = "2.6.5" PREFERRED_VERSION_glib-1.2-native = "1.2.10" -PREFERRED_VERSION_glib-2.0 = "2.10.0" +PREFERRED_VERSION_glib-2.0 = "2.12.0" PREFERRED_VERSION_glib-1.2 = "1.2.10" +PREFERRED_VERSION_pango = "1.12.0" +PREFERRED_VERSION_dbus = "0.61" +PREFERRED_VERSION_dbus-native = "0.61" +PREFERRED_PROVIDER_dbus-glib = "dbus" +PREFERRED_PROVIDER_virtual/db-native = "db-native" + +#<>------------------------------------------------------------------> #<> #<>Setting Preferred xserver-kdrive. Also choose diet-x11 as default libx11. -#<> +#<>------------------------------------------------------------------< PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20060312" PREFERRED_PROVIDER_tslib = "tslib" -PREFRRED_VERSION_cairo = "1.0.4" -#<> + + +#<>------------------------------------------------------------------> #<>Other Specific stuff. #<> #<> #<>We want to be able to build this for all jornadas so #<>to not mess up the folders we need to make them dynamic. #<>It will use different folders depending on Arch (set in local.conf) +#<>------------------------------------------------------------------< SRC_DIST_LOCAL = "copy" INHERIT += "package_ipk package_tar multimachine src_distribute_local" BBINCLUDELOGS = "yes" IMAGE_FSTYPES = "tar.bz2" TARGET_OS = "linux" + +#<>------------------------------------------------------------------> #<>What we want on the bootstrap image (extra) #<> -#<> +#<>------------------------------------------------------------------< BOOTSTRAP_EXTRA_RDEPENDS += "ncurses nano wireless-tools console-tools \ udev e2tools e2fsprogs kernel-modules keymaps \ wget" -#<> + +#<>------------------------------------------------------------------> #<>What Qte, libqte.. versions should we use. -#<> +#<>------------------------------------------------------------------< QTE_VERSION = "2.3.10" PALMTOP_USE_MULTITHREADED_QT = "yes" OPIE_VERSION = "1.2.2" require conf/distro/include/preferred-opie-versions.inc -#<> + +#<>------------------------------------------------------------------> #<> Lets decide on a GPE versipns -#<> +#<> And lets override GTK to something that builds +#<>------------------------------------------------------------------< require conf/distro/include/preferred-gpe-versions-2.7.inc +PREFERRED_VERSION_gtk+ = "2.8.16" +PREFERRED_VERSION_pango = "1.12.0" +PREFERRED_VERSION_cairo = "1.2.2" +PREFERRED_VERSION_gtk-engines = "2.7.4" -#<> + +#<>------------------------------------------------------------------> #<> We want pcmciautils, not pcmcia-cs -#<> +#<>------------------------------------------------------------------< PCMCIA_MANAGER = "pcmciautils" -#<> + +#<>------------------------------------------------------------------> #<> We are using gcc 4.1.1 so lets keep optimizations low -#<> +#<>------------------------------------------------------------------< FULL_OPTIMIZATION = "-O1" -#<> + +#<>------------------------------------------------------------------> #<>Our Image files should look abit better. #<> -#<> +#<>------------------------------------------------------------------< IMAGE_NAME = "${IMAGE_BASENAME}-Donkey-${MACHINE}" + +#<>------------------------------------------------------------------> #<> #<> +#<> General non-essential programs with known working versions #<> -#<> General non-essential programs -#<> -#<> -PREFERRED_VERSION_irssi = "0.8.10" \ No newline at end of file +#<>------------------------------------------------------------------< +PREFERRED_VERSION_irssi = "0.8.10" +PREFERRED_VERSION_mc = "4.6.1" +PREFERRED_VERSION_nano = "1.3.9" +PREFERRED_VERSION_ncurses = "5.4" +PREFERRED_VERSION_ncftp = "3.1.9" \ No newline at end of file -- cgit v1.2.3 From 808faadfbea5deb79b4bb14c64a6e8df4c4466e4 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Sun, 20 Aug 2006 02:31:20 +0000 Subject: php: upgrade PHP5 to 5.1.4, thanks to Shane Volpe , bug #1338 --- packages/php/php-5.0.5/.mtn2git_empty | 0 packages/php/php-5.0.5/autotools.patch | 90 ------------------------------- packages/php/php-5.0.5/endianness.patch | 10 ---- packages/php/php-5.1.4/.mtn2git_empty | 0 packages/php/php-5.1.4/autotools.patch | 94 +++++++++++++++++++++++++++++++++ packages/php/php_5.0.5.bb | 60 --------------------- packages/php/php_5.1.4.bb | 38 +++++++++++++ 7 files changed, 132 insertions(+), 160 deletions(-) delete mode 100644 packages/php/php-5.0.5/.mtn2git_empty delete mode 100644 packages/php/php-5.0.5/autotools.patch delete mode 100644 packages/php/php-5.0.5/endianness.patch create mode 100644 packages/php/php-5.1.4/.mtn2git_empty create mode 100644 packages/php/php-5.1.4/autotools.patch delete mode 100644 packages/php/php_5.0.5.bb create mode 100644 packages/php/php_5.1.4.bb diff --git a/packages/php/php-5.0.5/.mtn2git_empty b/packages/php/php-5.0.5/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/php/php-5.0.5/autotools.patch b/packages/php/php-5.0.5/autotools.patch deleted file mode 100644 index 7e466a425e..0000000000 --- a/packages/php/php-5.0.5/autotools.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff -Nur php-5.0.5~/acinclude.m4 php-5.0.5/acinclude.m4 ---- php-5.0.5~/acinclude.m4 2005-10-10 19:56:46.000000000 -0700 -+++ php-5.0.5/acinclude.m4 2005-10-10 19:56:55.000000000 -0700 -@@ -781,10 +781,10 @@ - OVERALL_TARGET=[]ifelse($1,,php,$1) - php_c_pre='$(CC)' - php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' -- php_c_post=' && echo > $[@]' -+ php_c_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]' - php_cxx_pre='$(CXX)' - php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' -- php_cxx_post=' && echo > $[@]' -+ php_cxx_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]' - php_lo=o - - case $with_pic in -@@ -1531,6 +1531,7 @@ - - dnl even newer glibcs have a different seeker definition... - -+ AC_CACHE_CHECK([if cookie io functions use off64_t], php_cv_lib_cookie_io_functions_use_off64_t, - AC_TRY_RUN([ - #define _GNU_SOURCE - #include -@@ -1560,8 +1561,8 @@ - } - - ], -- [ cookie_io_functions_use_off64_t=yes ], -- [ ] ) -+ [ php_cv_lib_cookie_io_functions_use_off64_t=yes ], -+ [ php_cv_lib_cookie_io_functions_use_off64_t=no ] )) - - else - dnl older glibc versions (up to 2.1.2 ?) -diff -Nur php-5.0.5~/configure.in php-5.0.5/configure.in ---- php-5.0.5~/configure.in 2005-10-10 19:56:46.000000000 -0700 -+++ php-5.0.5/configure.in 2005-10-10 19:56:55.000000000 -0700 -@@ -247,7 +247,7 @@ - sinclude(Zend/acinclude.m4) - sinclude(Zend/Zend.m4) - sinclude(TSRM/tsrm.m4) -- -+sinclude(TSRM/threads.m4) - - - divert(2) -diff -Nur php-5.0.5~/scripts/phpize.m4 php-5.0.5/scripts/phpize.m4 ---- php-5.0.5~/scripts/phpize.m4 2005-10-10 19:56:46.000000000 -0700 -+++ php-5.0.5/scripts/phpize.m4 2005-10-10 19:56:55.000000000 -0700 -@@ -1,7 +1,5 @@ - dnl This file becomes configure.in for self-contained extensions. - --AC_INIT(config.m4) -- - PHP_INIT_BUILD_SYSTEM - - AC_DEFUN([PHP_WITH_PHP_CONFIG],[ -@@ -55,8 +53,6 @@ - PHP_PROG_RE2C - AC_PROG_AWK - --sinclude(config.m4) -- - enable_static=no - enable_shared=yes - -diff -Nur php-5.0.5~/TSRM/threads.m4 php-5.0.5/TSRM/threads.m4 ---- php-5.0.5~/TSRM/threads.m4 2005-10-10 19:56:40.000000000 -0700 -+++ php-5.0.5/TSRM/threads.m4 2005-10-10 19:57:11.000000000 -0700 -@@ -86,7 +86,7 @@ - pthreads_working=no - ], [ - dnl For cross compiling running this test is of no use. NetWare supports pthreads -- pthreads_working=no -+ pthreads_working=yes - case $host_alias in - *netware*) - pthreads_working=yes -diff -Nur php-5.0.5~/TSRM/tsrm.m4 php-5.0.5/TSRM/tsrm.m4 ---- php-5.0.5~/TSRM/tsrm.m4 2005-10-10 19:56:40.000000000 -0700 -+++ php-5.0.5/TSRM/tsrm.m4 2005-10-10 19:56:55.000000000 -0700 -@@ -68,7 +68,6 @@ - ]) - - sinclude(threads.m4) --sinclude(TSRM/threads.m4) - - AC_DEFUN([TSRM_CHECK_PTHREADS],[ - diff --git a/packages/php/php-5.0.5/endianness.patch b/packages/php/php-5.0.5/endianness.patch deleted file mode 100644 index 0231727c33..0000000000 --- a/packages/php/php-5.0.5/endianness.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- php-5.0.5/Zend/zend_strtod.c~ 2005-10-10 19:58:06.000000000 -0700 -+++ php-5.0.5/Zend/zend_strtod.c 2005-10-10 20:21:35.000000000 -0700 -@@ -130,6 +130,7 @@ - * but the word order is big endian. - */ - #define IEEE_BIG_ENDIAN -+#undef IEEE_LITTLE_ENDIAN - #endif - - #ifdef __vax__ diff --git a/packages/php/php-5.1.4/.mtn2git_empty b/packages/php/php-5.1.4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/php/php-5.1.4/autotools.patch b/packages/php/php-5.1.4/autotools.patch new file mode 100644 index 0000000000..d198c8e36d --- /dev/null +++ b/packages/php/php-5.1.4/autotools.patch @@ -0,0 +1,94 @@ +diff -u'rNF^function' php-5.1.4~/acinclude.m4 php-5.1.4/acinclude.m4 +--- php-5.1.4~/acinclude.m4 2006-04-10 08:17:36.000000000 -0400 ++++ php-5.1.4/acinclude.m4 2006-08-16 22:32:58.000000000 -0400 +@@ -818,10 +818,10 @@ + OVERALL_TARGET=[]ifelse($1,,php,$1) + php_c_pre='$(LIBTOOL) --mode=compile $(CC)' + php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' +- php_c_post= ++ php_c_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]' + php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' + php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' +- php_cxx_post= ++ php_cxx_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]' + php_lo=lo + + case $with_pic in +@@ -1670,6 +1670,7 @@ + have_fopen_cookie=yes + + dnl even newer glibcs have a different seeker definition... ++AC_CACHE_CHECK([if cookie io functions use off64_t], php_cv_lib_cookie_io_functions_use_off64_t, + AC_TRY_RUN([ + #define _GNU_SOURCE + #include +@@ -1702,10 +1703,11 @@ + cookie_io_functions_use_off64_t=yes + ], [ + cookie_io_functions_use_off64_t=no +-], [ +- cookie_io_functions_use_off64_t=no +-]) +- ++], ++[ php_cv_lib_cookie_io_functions_use_off64_t=yes ], ++[ php_cv_lib_cookie_io_functions_use_off64_t=no ] )) ++ ++ + else + + dnl older glibc versions (up to 2.1.2 ?) +diff -u'rNF^function' php-5.1.4~/configure.in php-5.1.4/configure.in +--- php-5.1.4~/configure.in 2006-05-03 19:30:02.000000000 -0400 ++++ php-5.1.4/configure.in 2006-08-16 20:39:19.000000000 -0400 +@@ -209,6 +209,7 @@ + + sinclude(Zend/Zend.m4) + sinclude(TSRM/tsrm.m4) ++sinclude(TSRM/threads.m4) + + + divert(2) +diff -u'rNF^function' php-5.1.4~/scripts/phpize.m4 php-5.1.4/scripts/phpize.m4 +--- php-5.1.4~/scripts/phpize.m4 2006-04-10 08:16:17.000000000 -0400 ++++ php-5.1.4/scripts/phpize.m4 2006-08-16 20:39:19.000000000 -0400 +@@ -3,7 +3,6 @@ + divert(1) + + AC_PREREQ(2.13) +-AC_INIT(config.m4) + + PHP_CONFIG_NICE(config.nice) + +@@ -69,8 +68,6 @@ + PHP_PROG_RE2C + PHP_PROG_AWK + +-sinclude(config.m4) +- + enable_static=no + enable_shared=yes + +diff -u'rNF^function' php-5.1.4~/TSRM/threads.m4 php-5.1.4/TSRM/threads.m4 +--- php-5.1.4~/TSRM/threads.m4 2005-04-27 09:22:18.000000000 -0400 ++++ php-5.1.4/TSRM/threads.m4 2006-08-16 20:39:19.000000000 -0400 +@@ -86,7 +86,7 @@ + pthreads_working=no + ], [ + dnl For cross compiling running this test is of no use. NetWare supports pthreads +- pthreads_working=no ++ pthreads_working=yes + case $host_alias in + *netware*) + pthreads_working=yes +diff -u'rNF^function' php-5.1.4~/TSRM/tsrm.m4 php-5.1.4/TSRM/tsrm.m4 +--- php-5.1.4~/TSRM/tsrm.m4 2005-05-29 19:16:40.000000000 -0400 ++++ php-5.1.4/TSRM/tsrm.m4 2006-08-16 20:39:19.000000000 -0400 +@@ -68,7 +68,6 @@ + ]) + + sinclude(threads.m4) +-sinclude(TSRM/threads.m4) + + AC_DEFUN([TSRM_CHECK_PTHREADS],[ + diff --git a/packages/php/php_5.0.5.bb b/packages/php/php_5.0.5.bb deleted file mode 100644 index b4b721f85e..0000000000 --- a/packages/php/php_5.0.5.bb +++ /dev/null @@ -1,60 +0,0 @@ -SECTION = "console/network" -DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the CGI." -MAINTAINER = "Chris Larson " -LICENSE = "PHP" -DEPENDS = "zlib libxml2 mysql" -SRC_URI = "http://de3.php.net/distributions/php-${PV}.tar.bz2 \ - file://autotools.patch;patch=1 \ - file://endianness.patch;patch=1" -S = "${WORKDIR}/php-${PV}" - -inherit autotools - -CFLAGS += " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED" -EXTRA_OECONF = "--with-cgi --enable-sockets --enable-pcntl \ - --with-mysql=${STAGING_LIBDIR}/.. \ - --with-zlib --with-zlib-dir=${STAGING_LIBDIR}/.. \ - --without-libpng --without-libjpeg \ - --with-config-file-path=${sysconfdir}/php5 \ - --cache-file=config.cache \ - --disable-debug \ - --disable-rpath \ - --enable-bcmath \ - --enable-calendar \ - --enable-maintainer-zts \ - --enable-embed=shared \ - --enable-force-cgi-redirect \ - --enable-ftp \ - --enable-inline-optimization \ - --enable-magic-quotes \ - --enable-memory-limit \ - --enable-pic \ - --enable-safe-mode \ - --enable-sockets \ - --enable-track-vars \ - --enable-trans-sid \ - --enable-wddx \ - --sysconfdir=/etc/appWeb \ - --with-exec-dir=/etc/appWeb/exec \ - --with-db \ - --with-regex=system \ - --with-pear \ - --with-xml \ - --with-xmlrpc \ - --with-zlib \ - --without-iconv" - -EXTRA_OECONF += " --without-pear" -# Uncomment the following two lines, and comment the above to enable PEAR -#EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR}/php" -#DEPENDS += " php-native" - -acpaths = "" - -do_configure_prepend() { - find ${S} -type f | xargs sed -i 's:/usr/lib:${STAGING_LIBDIR}:' -} - -do_install () { - oe_runmake 'INSTALL_ROOT=${D}' install -} diff --git a/packages/php/php_5.1.4.bb b/packages/php/php_5.1.4.bb new file mode 100644 index 0000000000..fc982a678c --- /dev/null +++ b/packages/php/php_5.1.4.bb @@ -0,0 +1,38 @@ +SECTION = "console/network" +DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the CGI." +MAINTAINER = "Shane Volpe " +LICENSE = "PHP" +DEPENDS = "zlib libxml2 mysql libiconv" +SRC_URI = "http://us2.php.net/distributions/php-${PV}.tar.bz2\ + file://autotools.patch;patch=1" +S = "${WORKDIR}/php-${PV}" +PR = "r1" + +inherit autotools + +export THREADS="pthread" +export LIBS=" -lpthread " + +CFLAGS += " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED" +EXTRA_OECONF = "--without-iconv \ + --enable-discard-path \ + --enable-sockets \ + --enable-memory-limit \ + --enable-wddx \ + --with-zlib" + +EXTRA_OECONF += " --without-pear" +# Uncomment the following two lines, and comment the above to enable PEAR +#EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR}/php" +#DEPENDS += " php-native" + +acpaths = "" + +do_configure_append() { + find ${S} -type f | xargs sed -i 's:/usr/lib:${STAGING_LIBDIR}:' + find ${S} -type f | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' +} + +do_install () { + oe_runmake 'INSTALL_ROOT=${D}' install +} -- cgit v1.2.3 From 78d758eca2ba374026229ebe2254026dd08749b4 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sun, 20 Aug 2006 13:11:11 +0000 Subject: dbus: add 0.92, dbus-daemon install fix --- packages/dbus/dbus-0.92/.mtn2git_empty | 0 packages/dbus/dbus-0.92/dbus-1.init | 86 ++++++++++++++++++++++++ packages/dbus/dbus-0.92/fix-install-daemon.patch | 11 +++ packages/dbus/dbus-0.92/fix-segfault.patch | 11 +++ 4 files changed, 108 insertions(+) create mode 100644 packages/dbus/dbus-0.92/.mtn2git_empty create mode 100644 packages/dbus/dbus-0.92/dbus-1.init create mode 100644 packages/dbus/dbus-0.92/fix-install-daemon.patch create mode 100644 packages/dbus/dbus-0.92/fix-segfault.patch diff --git a/packages/dbus/dbus-0.92/.mtn2git_empty b/packages/dbus/dbus-0.92/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/dbus/dbus-0.92/dbus-1.init b/packages/dbus/dbus-0.92/dbus-1.init new file mode 100644 index 0000000000..60440b7223 --- /dev/null +++ b/packages/dbus/dbus-0.92/dbus-1.init @@ -0,0 +1,86 @@ +#! /bin/sh +# -*- coding: utf-8 -*- +# Debian init.d script for D-BUS +# Copyright © 2003 Colin Walters + +set -e + +DAEMON=/usr/bin/dbus-daemon +NAME=dbus-1 +DAEMONUSER=messagebus +PIDDIR=/var/run/dbus +PIDFILE=$PIDDIR/pid +DESC="system message bus" +EVENTDIR=/etc/dbus-1/event.d + +test -x $DAEMON || exit 0 + +# Source defaults file; edit that file to configure this script. +ENABLED=1 +PARAMS="" +if [ -e /etc/default/dbus-1 ]; then + . /etc/default/dbus-1 +fi + +test "$ENABLED" != "0" || exit 0 + +start_it_up() +{ + if [ ! -d $PIDDIR ]; then + mkdir -p $PIDDIR + chown $DAEMONUSER $PIDDIR + chgrp $DAEMONUSER $PIDDIR + fi + if [ -e $PIDFILE ]; then + PIDDIR=/proc/$(cat $PIDFILE) + if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then + echo "$DESC already started; not starting." + else + echo "Removing stale PID file $PIDFILE." + rm -f $PIDFILE + fi + fi + echo -n "Starting $DESC: " + start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS + echo "$NAME." + if [ -d $EVENTDIR ]; then + run-parts --arg=start $EVENTDIR + fi +} + +shut_it_down() +{ + if [ -d $EVENTDIR ]; then + run-parts --reverse --arg=stop $EVENTDIR + fi + echo -n "Stopping $DESC: " + start-stop-daemon --stop --quiet --pidfile $PIDFILE \ + --user $DAEMONUSER + # We no longer include these arguments so that start-stop-daemon + # can do its job even given that we may have been upgraded. + # We rely on the pidfile being sanely managed + # --exec $DAEMON -- --system $PARAMS + echo "$NAME." + rm -f $PIDFILE +} + +case "$1" in + start) + start_it_up + ;; + stop) + shut_it_down + ;; + restart|force-reload) + shut_it_down + sleep 1 + start_it_up + ;; + *) + echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/packages/dbus/dbus-0.92/fix-install-daemon.patch b/packages/dbus/dbus-0.92/fix-install-daemon.patch new file mode 100644 index 0000000000..0cfe5db650 --- /dev/null +++ b/packages/dbus/dbus-0.92/fix-install-daemon.patch @@ -0,0 +1,11 @@ +--- dbus-0.92/bus/Makefile.am.orig 2006-08-20 14:37:07.393810316 +0200 ++++ dbus-0.92/bus/Makefile.am 2006-08-20 14:38:01.509274554 +0200 +@@ -107,7 +107,7 @@ + $(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \ + chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \ + fi +- $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) ++ $(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) + $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus + $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d + $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services diff --git a/packages/dbus/dbus-0.92/fix-segfault.patch b/packages/dbus/dbus-0.92/fix-segfault.patch new file mode 100644 index 0000000000..de5bcff774 --- /dev/null +++ b/packages/dbus/dbus-0.92/fix-segfault.patch @@ -0,0 +1,11 @@ +--- /tmp/dbus-marshal-recursive.c 2006-07-28 14:58:08.000000000 +0200 ++++ dbus-0.90/dbus/dbus-marshal-recursive.c 2006-07-28 14:58:18.724411000 +0200 +@@ -1294,7 +1294,7 @@ + _dbus_string_get_length (&block->replacement) - block->padding, + &fixups)) + goto oom; +- ++printf("%s(%d)""got here", __FILE__, __LINE__); + #if RECURSIVE_MARSHAL_WRITE_TRACE + _dbus_verbose ("REPLACEMENT at padding %d len %d\n", block->padding, + _dbus_string_get_length (&block->replacement) - block->padding); -- cgit v1.2.3 From b36de12b97e17d1d8cee26e91d97ae9951b59d52 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 20 Aug 2006 21:27:22 +0000 Subject: classes/icecc.bbclass: Simplify, improve code creating a tar.bz2 For icecream we need to package a tar.bz2 containing our used toolchain. It must contain a gcc, g++ and cc1 and cc1plus and a spec file (if it is not built-in). Optionally it contains host libc.so and libfd.so (which we do not package). Simplify the code creating the tar.bz2 and make it work with any version of gcc/glibc/uclibc (untested). --- classes/icecc.bbclass | 56 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/classes/icecc.bbclass b/classes/icecc.bbclass index 658ccf3672..66a5bf79e3 100644 --- a/classes/icecc.bbclass +++ b/classes/icecc.bbclass @@ -34,6 +34,8 @@ def create_env(bb,d): float = bb.data.getVar('${TARGET_FPU}', d) or "hard" name = socket.gethostname() + # Stupid check to determine if we have built a libc and a cross + # compiler. try: os.stat(os.path.join(ice_dir, target_sys, 'lib', 'ld-linux.so.2')) os.stat(os.path.join(ice_dir, target_sys, 'bin', 'g++')) @@ -54,27 +56,41 @@ def create_env(bb,d): pass # FIXME find out the version of the compiler + # Consider using -print-prog-name={cc1,cc1plus} + # and -print-file-name=specs + + # We will use the GCC to tell us which tools to use + # What we need is: + # -gcc + # -g++ + # -as + # -cc1 + # -cc1plus + # and we add them to /usr/bin + tar = tarfile.open(tar_file, 'w:bz2') - tar.add(ice_dir + '/' + target_sys + '/lib/ld-linux.so.2', - target_sys + 'cross/lib/ld-linux.so.2') - tar.add(ice_dir + '/' + target_sys + '/lib/ld-linux.so.2', - target_sys + 'cross/lib/ld-2.3.3.so') - tar.add(ice_dir + '/' + target_sys + '/lib/libc-2.3.3.so', - target_sys + 'cross/lib/libc-2.3.3.so') - tar.add(ice_dir + '/' + target_sys + '/lib/libc.so.6', - target_sys + 'cross/lib/libc.so.6') - tar.add(ice_dir + '/' + target_sys + '/bin/gcc', - target_sys + 'cross/usr/bin/gcc') - tar.add(ice_dir + '/' + target_sys + '/bin/g++', - target_sys + 'cross/usr/bin/g++') - tar.add(ice_dir + '/' + target_sys + '/bin/as', - target_sys + 'cross/usr/bin/as') - tar.add(ice_dir + '/lib/gcc/' + target_sys +'/'+ VERSION + '/specs', - target_sys+'cross/usr/lib/gcc/'+target_sys+'/'+VERSION+'/lib/specs') - tar.add(ice_dir + '/libexec/gcc/'+target_sys+'/' + VERSION + '/cc1', - target_sys + 'cross/usr/lib/gcc/'+target_sys+'/'+VERSION+'/lib/cc1') - tar.add(ice_dir + '/libexec/gcc/arm-linux/' + VERSION + '/cc1plus', - target_sys+'cross/usr/lib/gcc/'+target_sys+'/'+VERSION+'/lib/cc1plus') + + # Now add the required files + tar.add(os.path.join(ice_dir,target_sys,'bin','gcc'), + os.path.join("usr","bin","gcc") ) + tar.add(os.path.join(ice_dir,target_sys,'bin','g++'), + os.path.join("usr","bin","g++") ) + tar.add(os.path.join(ice_dir,target_sys,'bin','as'), + os.path.join("usr","bin","as") ) + + # Now let us find cc1 and cc1plus + cc1 = os.popen("%s -print-prog-name=cc1" % data.getVar('CC', d, True)).read()[:-1] + cc1plus = os.popen("%s -print-prog-name=cc1plus" % data.getVar('CC', d, True)).read()[:-1] + spec = os.popen("%s -print-file-name=specs" % data.getVar('CC', d, True)).read()[:-1] + + # CC1 and CC1PLUS should be there... + tar.add(cc1, os.path.join('usr', 'bin', 'cc1')) + tar.add(cc1plus, os.path.join('usr', 'bin', 'cc1plus')) + + # spec - if it exists + if os.path.exists(spec): + tar.add(spec) + tar.close() return tar_file -- cgit v1.2.3 From eeb54f606de6ef294b91394df97da3b0f90bdefc Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 20 Aug 2006 22:04:16 +0000 Subject: multimachine.bbclass: Should use TARGET_OS, not HOST_OS --- classes/multimachine.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/multimachine.bbclass b/classes/multimachine.bbclass index 2248f326cc..01dec648c3 100644 --- a/classes/multimachine.bbclass +++ b/classes/multimachine.bbclass @@ -1,6 +1,6 @@ -STAMP = "${TMPDIR}/stamps/${MULTIMACH_ARCH}-${HOST_OS}/${PF}" -WORKDIR = "${TMPDIR}/work/${MULTIMACH_ARCH}-${HOST_OS}/${PF}" -STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_ARCH}-${HOST_OS}/kernel" +STAMP = "${TMPDIR}/stamps/${MULTIMACH_ARCH}-${TARGET_OS}/${PF}" +WORKDIR = "${TMPDIR}/work/${MULTIMACH_ARCH}-${TARGET_OS}/${PF}" +STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_ARCH}-${TARGET_OS}/kernel" # Find any machine specific sub packages and if present, mark the # whole package as machine specific for multimachine purposes. -- cgit v1.2.3 From 959a8d0369208ec82a46f14e265dd8ab58668ef9 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 20 Aug 2006 22:07:17 +0000 Subject: classes: Add task dependencies expressions, as required for the new multithreading version of bitbake. Also, set BB_DEFAULT_TASK to specify the default task (build) rather than hardcode into bitbake. --- classes/base.bbclass | 2 ++ classes/debian.bbclass | 4 ++++ classes/image_ipk.bbclass | 3 ++- classes/package.bbclass | 2 ++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index e36c3e3aa3..7e526e17da 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -1,3 +1,4 @@ +BB_DEFAULT_TASK = "build" PATCHES_DIR="${S}" def base_dep_prepend(d): @@ -584,6 +585,7 @@ python base_eventhandler() { addtask configure after do_unpack do_patch do_configure[dirs] = "${S} ${B}" do_configure[bbdepcmd] = "do_populate_staging" +do_configure[deptask] = "do_populate_staging" base_do_configure() { : } diff --git a/classes/debian.bbclass b/classes/debian.bbclass index 5688dad93b..698d917b51 100644 --- a/classes/debian.bbclass +++ b/classes/debian.bbclass @@ -6,6 +6,10 @@ STAGING_PKGMAPS_DIR = "${STAGING_DIR}/pkgmaps/debian" # depends are correct BUILD_ALL_DEPS = "1" +# Better expressed as ensure all RDEPENDS package before we package +# This means we can't have circular RDEPENDS/RRECOMMENDS +do_package[rdeptask] = "do_package" + python debian_package_name_hook () { import glob, copy, stat, errno, re diff --git a/classes/image_ipk.bbclass b/classes/image_ipk.bbclass index d3923f06a2..83e9acf315 100644 --- a/classes/image_ipk.bbclass +++ b/classes/image_ipk.bbclass @@ -1,7 +1,8 @@ inherit rootfs_ipk -# We need to follow RDEPENDS and RRECOMMENDS for images +# We need to recursively follow RDEPENDS and RRECOMMENDS for images BUILD_ALL_DEPS = "1" +do_rootfs[recrdeptask] = "do_package" # Images are generally built explicitly, do not need to be part of world. EXCLUDE_FROM_WORLD = "1" diff --git a/classes/package.bbclass b/classes/package.bbclass index 2791e4bcfa..0d6a7734af 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -734,6 +734,8 @@ python package_do_package () { } do_package[dirs] = "${D}" +# shlibs requires any DEPENDS to have already packaged for the *.list files +do_package[deptask] = "do_package" populate_packages[dirs] = "${D}" EXPORT_FUNCTIONS do_package do_shlibs do_split_locales mapping_rename_hook addtask package before do_build after do_populate_staging -- cgit v1.2.3 From 3a20ce21b8d7fc104d861431a0c5cf58cb895f5d Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Sun, 20 Aug 2006 22:29:45 +0000 Subject: sqlite3: add 3.3.7 --- packages/sqlite/sqlite3-3.3.7/.mtn2git_empty | 0 packages/sqlite/sqlite3-3.3.7/cross-compile.patch | 92 +++++++++++++++++++++++ packages/sqlite/sqlite3-3.3.7/ldflags.patch | 67 +++++++++++++++++ packages/sqlite/sqlite3-3.3.7/libtool.patch | 25 ++++++ packages/sqlite/sqlite3_3.3.7.bb | 2 + 5 files changed, 186 insertions(+) create mode 100644 packages/sqlite/sqlite3-3.3.7/.mtn2git_empty create mode 100644 packages/sqlite/sqlite3-3.3.7/cross-compile.patch create mode 100644 packages/sqlite/sqlite3-3.3.7/ldflags.patch create mode 100644 packages/sqlite/sqlite3-3.3.7/libtool.patch create mode 100644 packages/sqlite/sqlite3_3.3.7.bb diff --git a/packages/sqlite/sqlite3-3.3.7/.mtn2git_empty b/packages/sqlite/sqlite3-3.3.7/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/sqlite/sqlite3-3.3.7/cross-compile.patch b/packages/sqlite/sqlite3-3.3.7/cross-compile.patch new file mode 100644 index 0000000000..31d4f0d162 --- /dev/null +++ b/packages/sqlite/sqlite3-3.3.7/cross-compile.patch @@ -0,0 +1,92 @@ +--- sqlite-3.3.7/configure.ac.orig 2006-08-21 00:20:50.000000000 +0200 ++++ sqlite-3.3.7/configure.ac 2006-08-21 00:22:35.000000000 +0200 +@@ -187,10 +187,11 @@ + default_build_cflags="-g" + if test "$config_BUILD_CC" = ""; then + AC_PROG_CC +- if test "$cross_compiling" = "yes"; then +- AC_MSG_ERROR([unable to find a compiler for building build tools]) +- fi +- BUILD_CC=$CC ++# if test "$cross_compiling" = "yes"; then ++# AC_MSG_ERROR([unable to find a compiler for building build tools]) ++# fi ++# BUILD_CC=$CC ++BUILD_CC=gcc + default_build_cflags=$CFLAGS + else + BUILD_CC=$config_BUILD_CC +@@ -238,6 +239,12 @@ + TARGET_LINK=$config_TARGET_LINK + fi + AC_MSG_RESULT($TARGET_LINK) ++if test "$config_TARGET_LFLAGS" != ""; then ++ TARGET_LFLAGS=$config_TARGET_LFLAGS ++ else ++ TARGET_LFLAGS=$BUILD_LFLAGS ++ fi ++AC_MSG_RESULT($TARGET_LFLAGS) + AC_MSG_CHECKING([switches on the target compiler]) + if test "$config_TARGET_TFLAGS" != ""; then + TARGET_TFLAGS=$config_TARGET_TFLAGS +@@ -592,15 +599,7 @@ + # Figure out what C libraries are required to compile programs + # that use "readline()" library. + # +-if test "$config_TARGET_READLINE_LIBS" != ""; then +- TARGET_READLINE_LIBS="$config_TARGET_READLINE_LIBS" +-else +- CC=$TARGET_CC +- LIBS="" +- AC_SEARCH_LIBS(tgetent, [readline ncurses curses termcap]) +- AC_CHECK_LIB([readline], [readline]) +- TARGET_READLINE_LIBS="$LIBS" +-fi ++TARGET_READLINE_LIBS="-lreadline" + AC_SUBST(TARGET_READLINE_LIBS) + + ########## +@@ -615,41 +614,8 @@ + ########## + # Figure out where to get the READLINE header files. + # +-AC_MSG_CHECKING([readline header files]) +-found=no +-if test "$config_TARGET_READLINE_INC" != ""; then +- TARGET_READLINE_INC=$config_TARGET_READLINE_INC +- found=yes +-fi +-if test "$found" = "yes"; then +- AC_MSG_RESULT($TARGET_READLINE_INC) +-else +- AC_MSG_RESULT(not specified: still searching...) +- AC_CHECK_HEADER(readline.h, [found=yes]) +-fi +-if test "$found" = "no"; then +- for dir in /usr /usr/local /usr/local/readline /usr/contrib /mingw; do +- AC_CHECK_FILE($dir/include/readline.h, found=yes) +- if test "$found" = "yes"; then +- TARGET_READLINE_INC="-I$dir/include" +- break +- fi +- AC_CHECK_FILE($dir/include/readline/readline.h, found=yes) +- if test "$found" = "yes"; then +- TARGET_READLINE_INC="-I$dir/include/readline" +- break +- fi +- done +-fi +-if test "$found" = "yes"; then +- if test "$TARGET_READLINE_LIBS" = ""; then +- TARGET_HAVE_READLINE=0 +- else +- TARGET_HAVE_READLINE=1 +- fi +-else +- TARGET_HAVE_READLINE=0 +-fi ++TARGET_READLINE_INC="" ++TARGET_HAVE_READLINE=1 + AC_SUBST(TARGET_READLINE_INC) + AC_SUBST(TARGET_HAVE_READLINE) + diff --git a/packages/sqlite/sqlite3-3.3.7/ldflags.patch b/packages/sqlite/sqlite3-3.3.7/ldflags.patch new file mode 100644 index 0000000000..ee5105ffff --- /dev/null +++ b/packages/sqlite/sqlite3-3.3.7/ldflags.patch @@ -0,0 +1,67 @@ +--- sqlite-3.3.7/Makefile.in.orig 2006-08-20 23:05:36.000000000 +0200 ++++ sqlite-3.3.7/Makefile.in 2006-08-20 23:42:49.000000000 +0200 +@@ -31,6 +31,10 @@ + # + TCC = @TARGET_CC@ @TARGET_CFLAGS@ -I. -I${TOP}/src + ++# OE overrides ++# ++TARGET_LFLAGS = @TARGET_LFLAGS@ ++ + # Define -DNDEBUG to compile without debugging (i.e., for production usage) + # Omitting the define will cause extra debugging code to be inserted and + # includes extra comments when "EXPLAIN stmt" is used. +@@ -257,17 +261,17 @@ + | $(NAWK) '{print $$5,$$6}' >last_change + + libsqlite3.la: $(LIBOBJ) +- $(LTLINK) -o libsqlite3.la $(LIBOBJ) $(LIBPTHREAD) \ ++ $(LTLINK) -o libsqlite3.la $(LIBOBJ) $(TARGET_LFLAGS) $(LIBPTHREAD) \ + ${ALLOWRELEASE} -rpath $(libdir) -version-info "8:6:8" + + libtclsqlite3.la: tclsqlite.lo libsqlite3.la + $(LTLINK) -o libtclsqlite3.la tclsqlite.lo \ +- $(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(LIBPTHREAD) \ ++ $(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(TARGET_LFLAGS) $(LIBPTHREAD) \ + -rpath $(libdir)/sqlite \ + -version-info "8:6:8" + + sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h +- $(LTLINK) $(READLINE_FLAGS) $(LIBPTHREAD) \ ++ $(LTLINK) $(TARGET_LFLAGS) $(READLINE_FLAGS) $(LIBPTHREAD) \ + -o $@ $(TOP)/src/shell.c libsqlite3.la \ + $(LIBREADLINE) $(TLIBS) + +@@ -456,12 +460,12 @@ + + tclsqlite3: tclsqlite-shell.lo libsqlite3.la + $(LTLINK) -o tclsqlite3 tclsqlite-shell.lo \ +- libsqlite3.la $(LIBTCL) ++ libsqlite3.la $(TARGET_LFLAGS) $(LIBTCL) + + testfixture$(TEXE): $(TOP)/src/tclsqlite.c libsqlite3.la $(TESTSRC) + $(LTLINK) -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1 \ + $(TEMP_STORE) -o testfixture $(TESTSRC) $(TOP)/src/tclsqlite.c \ +- libsqlite3.la $(LIBTCL) ++ libsqlite3.la $(TARGET_LFLAGS) $(LIBTCL) + + + fulltest: testfixture$(TEXE) sqlite3$(TEXE) +@@ -471,7 +475,7 @@ + ./testfixture $(TOP)/test/quick.test + + sqlite3_analyzer$(TEXE): $(TOP)/src/tclsqlite.c libtclsqlite3.la \ +- $(TESTSRC) $(TOP)/tool/spaceanal.tcl ++ $(TARGET_LFLAGS) $(TESTSRC) $(TOP)/tool/spaceanal.tcl + sed \ + -e '/^#/d' \ + -e 's,\\,\\\\,g' \ +@@ -481,7 +485,7 @@ + $(TOP)/tool/spaceanal.tcl >spaceanal_tcl.h + $(LTLINK) -DTCLSH=2 -DSQLITE_TEST=1 $(TEMP_STORE)\ + -o sqlite3_analyzer$(EXE) $(TESTSRC) $(TOP)/src/tclsqlite.c \ +- libtclsqlite3.la $(LIBTCL) ++ libtclsqlite3.la $(TARGET_LFLAGS) $(LIBTCL) + + # Rules used to build documentation + # diff --git a/packages/sqlite/sqlite3-3.3.7/libtool.patch b/packages/sqlite/sqlite3-3.3.7/libtool.patch new file mode 100644 index 0000000000..ccf9993ed2 --- /dev/null +++ b/packages/sqlite/sqlite3-3.3.7/libtool.patch @@ -0,0 +1,25 @@ +Index: sqlite-3.2.1/Makefile.in +=================================================================== +--- sqlite-3.2.1.orig/Makefile.in 2005-03-23 17:09:39.000000000 +0100 ++++ sqlite-3.2.1/Makefile.in 2005-04-25 23:11:20.000000000 +0200 +@@ -15,7 +15,10 @@ + # The toplevel directory of the source tree. This is the directory + # that contains this "Makefile.in" and the "configure.in" script. + # +-TOP = @srcdir@ ++TOP = $(srcdir) ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ ++top_builddir = . + + # C Compiler and options for use in building executables that + # will run on the platform that is doing the build. +@@ -96,7 +99,7 @@ + exec_prefix = @exec_prefix@ + libdir = @libdir@ + INSTALL = @INSTALL@ +-LIBTOOL = ./libtool ++LIBTOOL = @LIBTOOL@ + ALLOWRELEASE = @ALLOWRELEASE@ + + # libtool compile/link/install diff --git a/packages/sqlite/sqlite3_3.3.7.bb b/packages/sqlite/sqlite3_3.3.7.bb new file mode 100644 index 0000000000..d21fb6ad3e --- /dev/null +++ b/packages/sqlite/sqlite3_3.3.7.bb @@ -0,0 +1,2 @@ +require sqlite3.inc +PR = "r2" -- cgit v1.2.3 From 89a69d490f2dc6f2de7f45ec92d63e28fb969e5a Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Sun, 20 Aug 2006 22:36:43 +0000 Subject: libsoup: add 2.2.96 --- packages/gnome/libsoup_2.2.96.bb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 packages/gnome/libsoup_2.2.96.bb diff --git a/packages/gnome/libsoup_2.2.96.bb b/packages/gnome/libsoup_2.2.96.bb new file mode 100644 index 0000000000..33a4f16d06 --- /dev/null +++ b/packages/gnome/libsoup_2.2.96.bb @@ -0,0 +1,18 @@ +LICENSE = "GPL" +DESCRIPTION = "An HTTP library implementation in C" +SECTION = "x11/gnome/libs" +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.2/${PN}-${PV}.tar.bz2" +DEPENDS = "glib-2.0 gnutls libxml2" +MAINTAINER = "Chris Lord " + +inherit autotools pkgconfig + +PACKAGES_DYNAMIC = "libsoup-2.2*" +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev = "${includedir}/ ${libdir}/" +FILES_${PN}-doc = "${datadir}/" + +do_stage() { + autotools_stage_all + ln -s ${STAGING_DATADIR}/pkgconfig/libsoup.pc ${STAGING_DATADIR}/pkgconfig/libsoup-2.2.pc +} -- cgit v1.2.3 From 2a8f467da1b250808cfcb5825b413551e028493a Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Sun, 20 Aug 2006 23:28:20 +0000 Subject: gst-plugins.inc: Turn on esd support, add dependency. --- packages/gstreamer/gst-plugins.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/gstreamer/gst-plugins.inc b/packages/gstreamer/gst-plugins.inc index 6ebf6560d1..54af128fb4 100644 --- a/packages/gstreamer/gst-plugins.inc +++ b/packages/gstreamer/gst-plugins.inc @@ -2,8 +2,8 @@ DESCRIPTION = "Plugins for GStreamer" SECTION = "multimedia" PRIORITY = "optional" MAINTAINER = "Felix Domke " -DEPENDS = "gstreamer libmikmod libmad liboil libogg tremor libvorbis libid3tag" -PR = "r0" +DEPENDS = "gstreamer libmikmod libmad liboil libogg tremor libvorbis libid3tag esound-gpe" +PR = "r1" # until we have decided for a final naming scheme, # keep using version 0.8 @@ -13,7 +13,7 @@ inherit autotools pkgconfig gconf SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2" -EXTRA_OECONF = "--disable-x --disable-aalib --disable-esd --disable-shout2 \ +EXTRA_OECONF = "--disable-x --disable-aalib --disable-shout2 \ --disable-sdl" acpaths = "-I ${S}/common/m4 -I ${S}/m4" @@ -28,8 +28,8 @@ python populate_packages_prepend () { do_split_packages(d, gst_libdir, '^libgst(.*)\.l?a$', 'gst-plugin-%s-dev', 'GStreamer plugin for %s (development files)') } -do_stage() { - autotools_stage_all -} +#do_stage() { +# autotools_stage_all +#} ALLOW_EMPTY = "1" -- cgit v1.2.3 From 66cd4cd0f81950147e8ad285b9dc14a66ccead64 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Mon, 21 Aug 2006 00:01:32 +0000 Subject: starling: Add inital release. --- packages/starling/.mtn2git_empty | 0 packages/starling/starling_0.1.bb | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 packages/starling/.mtn2git_empty create mode 100644 packages/starling/starling_0.1.bb diff --git a/packages/starling/.mtn2git_empty b/packages/starling/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/starling/starling_0.1.bb b/packages/starling/starling_0.1.bb new file mode 100644 index 0000000000..5f4311dfe5 --- /dev/null +++ b/packages/starling/starling_0.1.bb @@ -0,0 +1,26 @@ +LICENSE = "GPL" +SECTION = "gpe" +PRIORITY = "optional" +PR = "r0" +MAINTAINER = "Florian Boor + +inherit gpe autotools + +DESCRIPTION = "Starling audio player for GPE" +DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins-good gst-plugins-bad esound-gpe" +RDEPENDS = "esd \ + gst-plugins \ + gst-plugin-audio \ + gst-plugin-audioconvert \ + gst-plugin-audiofile \ + gst-plugin-esd \ + gst-plugin-typefindfunctions \ + gst-plugin-decodebin \ + gst-plugin-volume" + +RRECOMMENDS = "gst-plugin-mad \ + gst-plugin-tagedit \ + gst-plugin-ivorbis \ + gst-plugin-tcp" + +SRC_URI = "http://handhelds.org/~skyhusker/${P}.tar.bz2" -- cgit v1.2.3 From b1ffd3cf9d1349941d57048aa49845a4a61fa998 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 21 Aug 2006 11:47:54 +0000 Subject: openzaurus.conf: force BitBake to be atleast 1.4.4 --- conf/distro/include/openzaurus.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/distro/include/openzaurus.inc b/conf/distro/include/openzaurus.inc index b7f456320f..264cceecfd 100644 --- a/conf/distro/include/openzaurus.inc +++ b/conf/distro/include/openzaurus.inc @@ -16,3 +16,7 @@ BOOTSTRAP_EXTRA_RDEPENDS += "openzaurus-version" PARALLEL_INSTALL_MODULES = "1" DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" + +# Set minimal version of BitBake needed +BB_MIN_VERSION = "1.4.4" +INHERIT += "sanity" -- cgit v1.2.3 From 9c9201d4e014375ef0a075d5974b41468b845f3f Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 22 Aug 2006 08:42:48 +0000 Subject: linux-openzaurus: bump PR to get dependencies in modules recreated for feeds --- packages/linux/linux-openzaurus_2.6.17.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-openzaurus_2.6.17.bb index bd30de0562..950f9fd787 100644 --- a/packages/linux/linux-openzaurus_2.6.17.bb +++ b/packages/linux/linux-openzaurus_2.6.17.bb @@ -1,6 +1,6 @@ require linux-openzaurus.inc -PR = "r15" +PR = "r16" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ -- cgit v1.2.3 From 71447f62c6b08e13bb2c4ac4429268fc67ab6fa1 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 22 Aug 2006 08:45:37 +0000 Subject: linux-openzaurus: added dummy do_rm_work to not remove WORKDIR because wlan-ng stuff needs it --- packages/linux/linux-openzaurus.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc index 0bb2e3a645..bba29ac1d6 100644 --- a/packages/linux/linux-openzaurus.inc +++ b/packages/linux/linux-openzaurus.inc @@ -198,3 +198,7 @@ do_deploy() { do_deploy[dirs] = "${S}" addtask deploy before do_package after do_install + +# wlan-ng stuff need compiled kernel sources +do_rm_work() { +} -- cgit v1.2.3 From c0afd4cb563555e06843c196c8af83ad9df1b394 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Tue, 22 Aug 2006 08:48:46 +0000 Subject: udev: add 097 - drop support for kernels <2.6.15, udevsynthesize replaced by udevtrigger - split out libvolume_id into its own package - I set PKG_libvolume-id-dev="libvolume-id-dev" because otherwise libvolume-id-dev would be renamed to libvolume-id0, too. - DEFAULT_PREFERENCE="-1", it's not run-time tested yet. --- packages/udev/files/50-hostap_cs.rules | 4 + packages/udev/udev-092/50-hostap_cs.rules | 4 - packages/udev/udev-097/.mtn2git_empty | 0 packages/udev/udev-097/flags.patch | 51 +++++++ packages/udev/udev-097/init | 242 ++++++++++++++++++++++++++++++ packages/udev/udev-097/local.rules | 31 ++++ packages/udev/udev-097/permissions.rules | 109 ++++++++++++++ packages/udev/udev-097/udev.rules | 98 ++++++++++++ packages/udev/udev_097.bb | 59 ++++++++ 9 files changed, 594 insertions(+), 4 deletions(-) create mode 100644 packages/udev/files/50-hostap_cs.rules delete mode 100644 packages/udev/udev-092/50-hostap_cs.rules create mode 100644 packages/udev/udev-097/.mtn2git_empty create mode 100644 packages/udev/udev-097/flags.patch create mode 100644 packages/udev/udev-097/init create mode 100644 packages/udev/udev-097/local.rules create mode 100644 packages/udev/udev-097/permissions.rules create mode 100644 packages/udev/udev-097/udev.rules create mode 100644 packages/udev/udev_097.bb diff --git a/packages/udev/files/50-hostap_cs.rules b/packages/udev/files/50-hostap_cs.rules new file mode 100644 index 0000000000..efefdc58fc --- /dev/null +++ b/packages/udev/files/50-hostap_cs.rules @@ -0,0 +1,4 @@ +# hostap_cs needs ignore_cis_vcc=1 set - this should handle all cards +# +ACTION=="add", DEVICE=="hostap_cs", \ + SYSFS{func_id}=="0x06", RUN+="/sbin/modprobe hostap_cs ignore_cis_vcc=1" diff --git a/packages/udev/udev-092/50-hostap_cs.rules b/packages/udev/udev-092/50-hostap_cs.rules deleted file mode 100644 index efefdc58fc..0000000000 --- a/packages/udev/udev-092/50-hostap_cs.rules +++ /dev/null @@ -1,4 +0,0 @@ -# hostap_cs needs ignore_cis_vcc=1 set - this should handle all cards -# -ACTION=="add", DEVICE=="hostap_cs", \ - SYSFS{func_id}=="0x06", RUN+="/sbin/modprobe hostap_cs ignore_cis_vcc=1" diff --git a/packages/udev/udev-097/.mtn2git_empty b/packages/udev/udev-097/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/udev/udev-097/flags.patch b/packages/udev/udev-097/flags.patch new file mode 100644 index 0000000000..492a39881c --- /dev/null +++ b/packages/udev/udev-097/flags.patch @@ -0,0 +1,51 @@ +--- udev-089/Makefile.orig 2006-04-08 13:32:53.000000000 +0200 ++++ udev-089/Makefile 2006-04-08 13:34:27.000000000 +0200 +@@ -117,28 +117,28 @@ + AR = $(CROSS_COMPILE)ar + RANLIB = $(CROSS_COMPILE)ranlib + +-CFLAGS = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 ++override CFLAGS = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 + WARNINGS = -Wstrict-prototypes -Wsign-compare -Wshadow \ + -Wchar-subscripts -Wmissing-declarations -Wnested-externs \ + -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes +-CFLAGS += $(WARNINGS) ++override CFLAGS += $(WARNINGS) + + LDFLAGS = -Wl,-warn-common + + OPTFLAGS = -Os +-CFLAGS += $(OPTFLAGS) ++override CFLAGS += $(OPTFLAGS) + + ifeq ($(strip $(USE_LOG)),true) +- CFLAGS += -DUSE_LOG ++ override CFLAGS += -DUSE_LOG + endif + + # if DEBUG is enabled, then we do not strip + ifeq ($(strip $(DEBUG)),true) +- CFLAGS += -DDEBUG ++ override CFLAGS += -DDEBUG + endif + + ifeq ($(strip $(USE_GCOV)),true) +- CFLAGS += -fprofile-arcs -ftest-coverage ++ override CFLAGS += -fprofile-arcs -ftest-coverage + LDFLAGS += -fprofile-arcs + endif + +@@ -151,11 +151,11 @@ + ifeq ($(strip $(USE_SELINUX)),true) + UDEV_OBJS += udev_selinux.o + LIB_OBJS += -lselinux -lsepol +- CFLAGS += -DUSE_SELINUX ++ override CFLAGS += -DUSE_SELINUX + endif + + ifeq ($(strip $(USE_STATIC)),true) +- CFLAGS += -DUSE_STATIC ++ override CFLAGS += -DUSE_STATIC + LDFLAGS += -static + endif + diff --git a/packages/udev/udev-097/init b/packages/udev/udev-097/init new file mode 100644 index 0000000000..cc25c026a3 --- /dev/null +++ b/packages/udev/udev-097/init @@ -0,0 +1,242 @@ +#!/bin/sh -e +### BEGIN INIT INFO +# Provides: udev +# Required-Start: mountvirtfs +# Required-Stop: +# Default-Start: S +# Default-Stop: +# Short-Description: Start udevd, populate /dev and load drivers. +### END INIT INFO + +# we need to unmount /dev/pts/ and remount it later over the tmpfs +unmount_devpts() { + if mountpoint -q /dev/pts/; then + umount -l /dev/pts/ + fi + + if mountpoint -q /dev/shm/; then + umount -l /dev/shm/ + fi +} + +# mount a tmpfs over /dev, if somebody did not already do it +mount_tmpfs() { + if grep -E -q "^[^[:space:]]+ /dev tmpfs" /proc/mounts; then + return + fi + + # /dev/.static/dev/ is used by MAKEDEV to access the real /dev/ directory. + # /etc/udev/ is recycled as a temporary mount point because it's the only + # directory which is guaranteed to be available. + mount -n -o bind /dev /etc/udev + + if ! mount -n -o size=$tmpfs_size,mode=0755 -t tmpfs tmpfs /dev; then + umount /etc/udev + echo "udev requires tmpfs support, not started." + exit 1 + fi + + mkdir -p /dev/.static/dev + chmod 700 /dev/.static/ + # The mount options in busybox are non-standard... + if test -x /bin/mount.util-linux + then + /bin/mount.util-linux --move /etc/udev /dev/.static/dev + elif test -x /bin/busybox + then + busybox mount -n -o move /etc/udev /dev/.static/dev + else + echo "udev requires an identifiable mount command, not started." + umount /etc/udev + umount /dev + exit 1 + fi +} + +create_dev_makedev() { + if [ -e /sbin/MAKEDEV ]; then + [ ! -e /dev/MAKEDEV ] || ln -s /sbin/MAKEDEV /dev/MAKEDEV + else + ln -s /bin/true /dev/MAKEDEV + fi +} + +# I hate this hack. -- Md +make_extra_nodes() { + if [ "$(echo /lib/udev/devices/*)" != "/lib/udev/devices/*" ]; then + cp -a /lib/udev/devices/* /dev/ + fi + + [ -e /etc/udev/links.conf ] || return 0 + grep '^[^#]' /etc/udev/links.conf | \ + while read type name arg1; do + [ "$type" -a "$name" -a ! -e "/dev/$name" -a ! -L "/dev/$name" ] ||continue + case "$type" in + L) ln -s $arg1 /dev/$name ;; + D) mkdir -p /dev/$name ;; + M) mknod -m 600 /dev/$name $arg1 ;; + *) echo "links.conf: unparseable line ($type $name $arg1)" ;; + esac + done +} + +supported_kernel() { + case "$(uname -r)" in + 2.[012345].*|2.6.[0-9]|2.6.[0-9][!0-9]*) return 1 ;; + 2.6.1[0-4]|2.6.1[0-4][!0-9]*) return 1 ;; + esac + return 0 +} + +load_input_modules() { + case "$(uname -r)" in + 2.6.1[0-5]|2.6.1[0-5][!0-9]*) ;; # <= 2.6.15 + *) return 0 + esac + + for module in mousedev evdev joydev; do + modprobe -q $module || true + done +} + +# shell version of /usr/bin/tty +my_tty() { + [ -x /bin/readlink ] || return 0 + [ -e /proc/self/fd/0 ] || return 0 + readlink --silent /proc/self/fd/0 || true +} + +warn_if_interactive() { + if [ "$RUNLEVEL" = "S" -a "$PREVLEVEL" = "N" ]; then + return + fi + + TTY=$(my_tty) + if [ -z "$TTY" -o "$TTY" = "/dev/console" ]; then + return + fi + + printf "\n\n\nIt has been detected that the command\n\n\t$0 $*\n\n" + printf "has been run from an interactive shell.\n" + printf "It will probably not do what you expect, so this script will wait\n" + printf "60 seconds before continuing. Press ^C to stop it.\n" + printf "RUNNING THIS COMMAND IS HIGHLY DISCOURAGED!\n\n\n\n" + sleep 60 +} + +############################################################################## + +[ -x /sbin/udevd ] || exit 0 + +PATH="/sbin:/bin:/usr/bin" + +# defaults +tmpfs_size="10M" +udev_root="/dev" + +if [ -e /etc/udev/udev.conf ]; then + . /etc/udev/udev.conf +fi + +if ! supported_kernel; then + echo "udev requires a kernel >= 2.6.15, not started." + exit 1 +fi + +if [ ! -e /proc/filesystems ]; then + echo "udev requires a mounted procfs, not started." + exit 1 +fi + +if ! grep -q '[[:space:]]tmpfs$' /proc/filesystems; then + echo "udev requires tmpfs support, not started." + exit 1 +fi + +if [ ! -d /sys/class/ ]; then + echo "udev requires a mounted sysfs, not started." + exit 1 +fi + +if [ ! -e /proc/sys/kernel/hotplug ]; then + echo "udev requires hotplug support, not started." + exit 1 +fi + +############################################################################## + +# When modifying this script, do not forget that between the time that +# the new /dev has been mounted and udevsynthesize has been run there will be +# no /dev/null. This also means that you cannot use the "&" shell command. + +udev_root=${udev_root%/} + +case "$1" in + start) + if [ -e "$udev_root/.udev/" ]; then + if mountpoint -q $udev_root/; then + TMPFS_MOUNTED=1 + else + echo ".udev/ already exists on the static $udev_root!" + fi + else + warn_if_interactive + fi + + echo > /proc/sys/kernel/hotplug + + if [ -z "$TMPFS_MOUNTED" ]; then + unmount_devpts + mount_tmpfs + [ -d /proc/1 ] || mount -n /proc + fi + + # /dev/null must be created before udevd is started + make_extra_nodes + + echo "Starting the hotplug events dispatcher" "udevd" + udevd --daemon + + # if this directory is not present /dev will not be updated by udev + mkdir -p /dev/.udev/db/ /dev/.udev/queue/ + + echo "Synthesizing the initial hotplug events" + udevtrigger + + load_input_modules + create_dev_makedev + + # wait for the udevd childs to finish + echo "Waiting for /dev to be fully populated" + if ! udevsettle; then + echo 'timeout' + fi + ;; + + stop) + echo "Stopping the hotplug events dispatcher" "udevd" + start-stop-daemon --stop --name udevd --quiet + ;; + + restart) + echo "Stopping the hotplug events dispatcher" "udevd" + if start-stop-daemon --stop --name udevd --quiet ; then + exit 1 + fi + + echo "Starting the hotplug events dispatcher" "udevd" + udevd --daemon + ;; + + reload) + udevcontrol reload_rules + ;; + + *) + echo "Usage: /etc/init.d/udev {start|stop|restart|reload}" + exit 1 + ;; +esac + +exit 0 + diff --git a/packages/udev/udev-097/local.rules b/packages/udev/udev-097/local.rules new file mode 100644 index 0000000000..2308b52c4a --- /dev/null +++ b/packages/udev/udev-097/local.rules @@ -0,0 +1,31 @@ +# There are a number of modifiers that are allowed to be used in some +# of the different fields. They provide the following subsitutions: +# +# %n the "kernel number" of the device. +# For example, 'sda3' has a "kernel number" of '3' +# %e the smallest number for that name which does not matches an existing node +# %k the kernel name for the device +# %M the kernel major number for the device +# %m the kernel minor number for the device +# %b the bus id for the device +# %c the string returned by the PROGRAM +# %s{filename} the content of a sysfs attribute +# %% the '%' char itself +# + +# Media automounting +SUBSYSTEM=="block", ACTION=="add" RUN+="/etc/udev/scripts/mount.sh" +SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh" + +# Handle network interface setup +SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh" +SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh" + +# The first rtc device is symlinked to /dev/rtc +KERNEL=="rtc0", SYMLINK+="rtc" + +# Try and modprobe for drivers for new hardware +ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}" + +# Create a symlink to any touchscreen input device +SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0,1*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0" diff --git a/packages/udev/udev-097/permissions.rules b/packages/udev/udev-097/permissions.rules new file mode 100644 index 0000000000..8da35c3090 --- /dev/null +++ b/packages/udev/udev-097/permissions.rules @@ -0,0 +1,109 @@ +ACTION!="add", GOTO="permissions_end" + +# workarounds needed to synchronize with sysfs +DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus" +SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt" +# only needed for kernels < 2.6.16 +SUBSYSTEM=="net", WAIT_FOR_SYSFS="address" +# only needed for kernels < 2.6.17 +SUBSYSTEM=="net", ENV{PHYSDEVDRIVER}=="?*", WAIT_FOR_SYSFS="device/driver" + +# default permissions for block devices +SUBSYSTEM=="block", GROUP="disk" +SUBSYSTEM=="block", SYSFS{removable}=="1", GROUP="floppy" + +# IDE devices +BUS=="ide", KERNEL=="hd[a-z]|pcd[0-9]*", DRIVER=="ide-cdrom|pcd", \ + IMPORT{program}="cdrom_id --export $tempnode" +ENV{ID_CDROM}=="?*", GROUP="cdrom" +BUS=="ide", KERNEL=="ht[0-9]*", GROUP="tape" +BUS=="ide", KERNEL=="nht[0-9]*", GROUP="tape" + +# SCSI devices +BUS=="scsi", SYSFS{type}=="1", GROUP="tape" +BUS=="scsi", SYSFS{type}=="3", SYSFS{vendor}=="HP", GROUP="scanner" +BUS=="scsi", SYSFS{type}=="5", GROUP="cdrom" +BUS=="scsi", SYSFS{type}=="6", GROUP="scanner" + +# USB devices +BUS=="usb", KERNEL=="legousbtower*", MODE="0666" +BUS=="usb", KERNEL=="lp[0-9]*", GROUP="lp" + +# usbfs-like devices +SUBSYSTEM=="usb_device", MODE="0664" + +# iRiver music players +SUBSYSTEM=="usb_device", GROUP="plugdev", \ + SYSFS{idVendor}=="4102", SYSFS{idProduct}=="10[01][135789]" + +# serial devices +SUBSYSTEM=="tty", GROUP="dialout" +SUBSYSTEM=="capi", GROUP="dialout" +SUBSYSTEM=="slamr", GROUP="dialout" +SUBSYSTEM=="zaptel", GROUP="dialout" + +# vc devices (all members of the tty subsystem) +KERNEL=="ptmx", MODE="0666", GROUP="root" +KERNEL=="console", MODE="0600", GROUP="root" +KERNEL=="tty", MODE="0666", GROUP="root" +KERNEL=="tty[0-9]*", GROUP="root" +KERNEL=="pty*", MODE="0666", GROUP="tty" + +# video devices +SUBSYSTEM=="video4linux", GROUP="video" +SUBSYSTEM=="drm", GROUP="video" +SUBSYSTEM=="dvb", GROUP="video" +SUBSYSTEM=="em8300", GROUP="video" +SUBSYSTEM=="graphics", GROUP="video" +SUBSYSTEM=="nvidia", GROUP="video" + +# misc devices +KERNEL=="random", MODE="0666" +KERNEL=="urandom", MODE="0666" +KERNEL=="mem", MODE="0640", GROUP="kmem" +KERNEL=="kmem", MODE="0640", GROUP="kmem" +KERNEL=="port", MODE="0640", GROUP="kmem" +KERNEL=="full", MODE="0666" +KERNEL=="null", MODE="0666" +KERNEL=="zero", MODE="0666" +KERNEL=="inotify", MODE="0666" +KERNEL=="sgi_fetchop", MODE="0666" +KERNEL=="sonypi", MODE="0666" +KERNEL=="agpgart", GROUP="video" +KERNEL=="nvram", GROUP="nvram" +KERNEL=="rtc", GROUP="audio" +KERNEL=="tpm*", MODE="0600", OWNER="tss", GROUP="tss" +KERNEL=="fuse", GROUP="fuse" + +KERNEL=="cdemu[0-9]*", GROUP="cdrom" +KERNEL=="pktcdvd[0-9]*", GROUP="cdrom" +KERNEL=="pktcdvd", MODE="0644" + +KERNEL=="uverbs*", GROUP="rdma" +KERNEL=="ucm*", GROUP="rdma" + +# printers and parallel devices +SUBSYSTEM=="printer", GROUP="lp" +SUBSYSTEM=="ppdev", GROUP="lp" +KERNEL=="pt[0-9]*", GROUP="tape" +KERNEL=="pht[0-9]*", GROUP="tape" + +# sound devices +SUBSYSTEM=="sound", GROUP="audio" + +# ieee1394 devices +KERNEL=="raw1394", GROUP="disk" +KERNEL=="dv1394*", GROUP="video" +KERNEL=="video1394*", GROUP="video" + +# input devices +KERNEL=="event[0-9]*", SYSFS{name}=="*dvb*|*DVB*|* IR *" \ + MODE="0664", GROUP="video" +KERNEL=="js[0-9]*", MODE="0664" + +# AOE character devices +SUBSYSTEM=="aoe", MODE="0220", GROUP="disk" +SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440" + +LABEL="permissions_end" + diff --git a/packages/udev/udev-097/udev.rules b/packages/udev/udev-097/udev.rules new file mode 100644 index 0000000000..9c4ea4214d --- /dev/null +++ b/packages/udev/udev-097/udev.rules @@ -0,0 +1,98 @@ +# There are a number of modifiers that are allowed to be used in some +# of the different fields. They provide the following subsitutions: +# +# %n the "kernel number" of the device. +# For example, 'sda3' has a "kernel number" of '3' +# %e the smallest number for that name which does not matches an existing node +# %k the kernel name for the device +# %M the kernel major number for the device +# %m the kernel minor number for the device +# %b the bus id for the device +# %c the string returned by the PROGRAM +# %s{filename} the content of a sysfs attribute +# %% the '%' char itself +# + +# SCSI devices +BUS=="scsi", KERNEL=="sr[0-9]*", NAME="scd%n", SYMLINK+="sr%n" + +# USB devices +BUS=="usb", KERNEL=="auer[0-9]*", NAME="usb/%k" +BUS=="usb", KERNEL=="cpad[0-9]*", NAME="usb/%k" +BUS=="usb", KERNEL=="dabusb*", NAME="usb/%k" +BUS=="usb", KERNEL=="hiddev*", NAME="usb/%k" +BUS=="usb", KERNEL=="legousbtower*", NAME="usb/%k" +BUS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k" +BUS=="usb", KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", \ + SYMLINK+="pilot" + +# usbfs-like devices +SUBSYSTEM=="usb_device", \ + PROGRAM="/bin/sh -c 'export X=%k; export X=$${X#usbdev}; export B=$${X%%%%.*}; export D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c" + +# serial devices +KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20" +KERNEL=="capi[0-9]*", NAME="capi/%n" + +# video devices +KERNEL=="card[0-9]*", NAME="dri/%k" + +# misc devices +KERNEL=="hw_random", NAME="hwrng" +KERNEL=="tun", NAME="net/%k" + +KERNEL=="cdemu[0-9]*", NAME="cdemu/%n" +KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%n" +KERNEL=="pktcdvd", NAME="pktcdvd/control" + +KERNEL=="cpu[0-9]*", NAME="cpu/%n/cpuid" +KERNEL=="msr[0-9]*", NAME="cpu/%n/msr" +KERNEL=="microcode", NAME="cpu/microcode" + +KERNEL=="umad*", NAME="infiniband/%k" +KERNEL=="issm*", NAME="infiniband/%k" +KERNEL=="uverbs*", NAME="infiniband/%k" +KERNEL=="ucm", NAME="infiniband/%k" + +KERNEL=="buzzer", NAME="misc/buzzer" + +# ALSA devices +KERNEL=="controlC[0-9]*", NAME="snd/%k" +KERNEL=="hwC[D0-9]*", NAME="snd/%k" +KERNEL=="pcmC[D0-9cp]*", NAME="snd/%k" +KERNEL=="midiC[D0-9]*", NAME="snd/%k" +KERNEL=="timer", NAME="snd/%k" +KERNEL=="seq", NAME="snd/%k" + +# ieee1394 devices +KERNEL=="dv1394*", NAME="dv1394/%n" +KERNEL=="video1394*", NAME="video1394/%n" + +# input devices +KERNEL=="mice", NAME="input/%k" +KERNEL=="mouse[0-9]*", NAME="input/%k" +KERNEL=="event[0-9]*", NAME="input/%k" +KERNEL=="js[0-9]*", NAME="input/%k" +KERNEL=="ts[0-9]*", NAME="input/%k" +KERNEL=="uinput", NAME="input/%k" + +# Zaptel +KERNEL=="zapctl", NAME="zap/ctl" +KERNEL=="zaptimer", NAME="zap/timer" +KERNEL=="zapchannel", NAME="zap/channel" +KERNEL=="zappseudo", NAME="zap/pseudo" +KERNEL=="zap[0-9]*", NAME="zap/%n" + +# AOE character devices +SUBSYSTEM=="aoe", KERNEL=="discover", NAME="etherd/%k" +SUBSYSTEM=="aoe", KERNEL=="err", NAME="etherd/%k" +SUBSYSTEM=="aoe", KERNEL=="interfaces", NAME="etherd/%k" + +# device mapper creates its own device nodes, so ignore these +KERNEL=="dm-[0-9]*", OPTIONS+="ignore_device" +KERNEL=="device-mapper", NAME="mapper/control" + +KERNEL=="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660" + +# Firmware Helper +ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper" diff --git a/packages/udev/udev_097.bb b/packages/udev/udev_097.bb new file mode 100644 index 0000000000..29fa05c965 --- /dev/null +++ b/packages/udev/udev_097.bb @@ -0,0 +1,59 @@ +DEFAULT_PREFERENCE = "-1" + +require udev.inc + +DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \ +/dev/, handles hotplug events and loads drivers at boot time. It replaces \ +the hotplug package and requires a kernel not older than 2.6.15." + +PR = "r0" + +SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ + file://noasmlinkage.patch;patch=1 \ + file://flags.patch;patch=1 \ + file://mount.blacklist \ + " + +SRC_URI_append_h2200 = " file://50-hostap_cs.rules " +PACKAGE_ARCH_h2200 = "h2200" + +INITSCRIPT_PARAMS = "start 03 S ." + +PACKAGES =+ "libvolume-id-dev libvolume-id" +PKG_libvolume-id-dev = "libvolume-id-dev" +FILES_libvolume-id-dev = "${includedir}/libvolume_id.h ${libdir}/libvolume_id.a ${libdir}/libvolume_id.so ${libdir}/pkgconfig/libvolume_id.pc" +FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*" +FILES_${PN} += "${base_libdir}/udev/*" +FILES_${PN}-dbg += "${base_libdir}/udev/.debug" +UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" +EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix=" + +do_install () { + install -d ${D}${usrsbindir} \ + ${D}${sbindir} + oe_runmake 'DESTDIR=${D}' INSTALL=install install + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev + + install -d ${D}${sysconfdir}/udev/rules.d/ + + install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/ + install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules + install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules + install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules + install -m 0644 ${WORKDIR}/links.conf ${D}${sysconfdir}/udev/links.conf + if [ "${UDEV_DEVFS_RULES}" = "1" ]; then + install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules + fi + + install -d ${D}${sysconfdir}/udev/scripts/ + + install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh + install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts + + install -d ${D}${base_libdir}/udev/ +} + +do_install_append_h2200() { + install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules +} -- cgit v1.2.3 From a15a508dcbdb819b5d87d837956eed6d75003eb9 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Tue, 22 Aug 2006 08:53:25 +0000 Subject: udev: stop overwriting description in udev.inc --- packages/udev/udev.inc | 2 +- packages/udev/udev_097.bb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/udev/udev.inc b/packages/udev/udev.inc index 5b7024cd72..5245d6e2b3 100644 --- a/packages/udev/udev.inc +++ b/packages/udev/udev.inc @@ -1,4 +1,4 @@ -DESCRIPTION = "udev is a program which dynamically creates and removes device nodes from \ +DESCRIPTION ?= "udev is a program which dynamically creates and removes device nodes from \ /dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel." LICENSE = "GPL" diff --git a/packages/udev/udev_097.bb b/packages/udev/udev_097.bb index 29fa05c965..d2bb043c50 100644 --- a/packages/udev/udev_097.bb +++ b/packages/udev/udev_097.bb @@ -1,7 +1,5 @@ DEFAULT_PREFERENCE = "-1" -require udev.inc - DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \ /dev/, handles hotplug events and loads drivers at boot time. It replaces \ the hotplug package and requires a kernel not older than 2.6.15." @@ -14,6 +12,8 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://mount.blacklist \ " +require udev.inc + SRC_URI_append_h2200 = " file://50-hostap_cs.rules " PACKAGE_ARCH_h2200 = "h2200" -- cgit v1.2.3 From 9534a5ea1e01133ed20093a8b3f24ddd071d9070 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Tue, 22 Aug 2006 08:58:18 +0000 Subject: udev: add description for libvolume_id --- packages/udev/udev_097.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/udev/udev_097.bb b/packages/udev/udev_097.bb index d2bb043c50..2e9e8d500f 100644 --- a/packages/udev/udev_097.bb +++ b/packages/udev/udev_097.bb @@ -3,6 +3,10 @@ DEFAULT_PREFERENCE = "-1" DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \ /dev/, handles hotplug events and loads drivers at boot time. It replaces \ the hotplug package and requires a kernel not older than 2.6.15." +DESCRIPTION_libvolume-id = "libvolume_id shared library, \ +used to detect the type of a file system and read its metadata." +DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \ +needed to link programs with libvolume_id." PR = "r0" -- cgit v1.2.3 From 288100abb8fb1973b071b93f89c5f112659e23e8 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 22 Aug 2006 09:18:31 +0000 Subject: base-files: (un)load ohci-hcd on tosa to get usb working after suspend/resume --- packages/base-files/base-files/tosa/usbd | 6 +++++- packages/base-files/base-files_3.0.14.bb | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/base-files/base-files/tosa/usbd b/packages/base-files/base-files/tosa/usbd index 40931ee8e9..8c80044167 100644 --- a/packages/base-files/base-files/tosa/usbd +++ b/packages/base-files/base-files/tosa/usbd @@ -1 +1,5 @@ -usbdmodule=pxa_bi +# I know that this was created for usb-client stuff +# but tosa/2.6 need (un)loading USB Host module +# on suspend/resume and this way is simplest one ;) + +usbdmodule=ohci-hcd diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 85c0e84d6e..d4c03bdefe 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r53" +PR = "r54" LICENSE = "GPL" SRC_URI = " \ -- cgit v1.2.3 From 1ddd28e44a093f410201d8c6bbe91a85aaa4470a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 22 Aug 2006 09:31:58 +0000 Subject: base.bbclass: remove nostamp for fetch * this will force a full rebuild, so have some coffee + cookies ready --- classes/base.bbclass | 1 - 1 file changed, 1 deletion(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index 7e526e17da..56a13ff309 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -324,7 +324,6 @@ python base_do_mrproper() { addtask fetch do_fetch[dirs] = "${DL_DIR}" -do_fetch[nostamp] = "1" python base_do_fetch() { import sys -- cgit v1.2.3 From 3109615e98eddd744d9ba9b428086ae7964944c7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 22 Aug 2006 09:48:18 +0000 Subject: LAB-kernel cvs: add hhv version check --- packages/linux/LAB-kernel_cvs.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/linux/LAB-kernel_cvs.bb b/packages/linux/LAB-kernel_cvs.bb index aae29cd23f..aa393af203 100644 --- a/packages/linux/LAB-kernel_cvs.bb +++ b/packages/linux/LAB-kernel_cvs.bb @@ -33,7 +33,12 @@ HHV = "0" # KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}" + do_configure() { + if [ `grep EXTRAVERSION Makefile | grep hh | awk '{print $3}' | sed s/-hh//` != ${HHV} ]; then + die "-hh version mismatch" + fi + # Substitute our uid/gid so the initramfs gets the right ownership. MY_UID=`id -u` MY_GID=`id -g` -- cgit v1.2.3 From 23350e2fe42ee3847ac9a6aaf4821613752f63e6 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 22 Aug 2006 10:52:40 +0000 Subject: netbase: bump PR because of change of tosa interfaces pushed in 5ea9eb6f097fe0b646889d1b3a1312d9d7fc796e - disable usage of usbctl on tosa/2.6 until we get 2.6 version --- packages/netbase/netbase_4.21.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb index d79dbc2a26..8c0652daec 100644 --- a/packages/netbase/netbase_4.21.bb +++ b/packages/netbase/netbase_4.21.bb @@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \ infrastructure for basic TCP/IP based networking." SECTION = "base" LICENSE = "GPL" -PR = "r11" +PR = "r12" inherit update-rc.d -- cgit v1.2.3 From 14ef0be15b166f8fcce1c6e54ce9d6dedbecf442 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 22 Aug 2006 10:58:48 +0000 Subject: zaurus-updater: move do_deploy so it does not conflict with rm_work applied changes from dc69aab02eb323fa6a030fa05f7b63be3642fb52 through 41767e9744f20a6d01a4cede1ef96c50c85d78f6 --- packages/zaurus-updater/zaurus-updater.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb index 26cf1e5453..3a45a2bf74 100644 --- a/packages/zaurus-updater/zaurus-updater.bb +++ b/packages/zaurus-updater/zaurus-updater.bb @@ -28,4 +28,4 @@ do_deploy() { esac } -addtask deploy before do_build after do_compile +addtask deploy before do_package after do_compile -- cgit v1.2.3 From 5da68c2ea813c62978286f7f0df58a927448ff35 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Tue, 22 Aug 2006 11:00:02 +0000 Subject: dbus: ad 0.92, last commit was missing the actual recipe --- packages/dbus/dbus_0.92.bb | 64 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 packages/dbus/dbus_0.92.bb diff --git a/packages/dbus/dbus_0.92.bb b/packages/dbus/dbus_0.92.bb new file mode 100644 index 0000000000..a4ab61322f --- /dev/null +++ b/packages/dbus/dbus_0.92.bb @@ -0,0 +1,64 @@ +DEFAULT_PREFERENCE="-1" + +SECTION = "base" +PR = "r1" +HOMEPAGE = "http://www.freedesktop.org/Software/dbus" +DESCRIPTION = "message bus system for applications to talk to one another" +LICENSE = "GPL" +DEPENDS = "expat glib-2.0 virtual/libintl" + +SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \ + file://cross.patch;patch=1 \ + file://tmpdir.patch;patch=1 \ + file://dbus-1.init \ + file://fix-segfault.patch;patch=1 \ + file://fix-install-daemon.patch;patch=1" + +inherit autotools pkgconfig update-rc.d gettext + +INITSCRIPT_NAME = "dbus-1" +INITSCRIPT_PARAMS = "defaults" + +CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf" + +FILES_${PN} = "${bindir}/dbus-daemon ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${sysconfdir} ${datadir}/dbus-1/services ${libdir}/lib*.so.*" +FILES_${PN}-dev += "${libdir}/dbus-1.0/include" + +pkg_postinst_dbus() { +#!/bin/sh + +# can't do adduser stuff offline +if [ "x$D" != "x" ]; then + exit 1 +fi + +MESSAGEUSER=messagebus +MESSAGEHOME=/var/run/dbus + +mkdir -p $MESSAGEHOME || true +chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER" +chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER" +} + +EXTRA_OECONF = "--disable-qt --disable-qt3 --disable-gtk --disable-tests \ + --disable-checks --disable-xml-docs --disable-doxygen-docs \ + --with-xml=expat --without-x" + +do_stage () { + oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR} + + autotools_stage_includes + + mkdir -p ${STAGING_LIBDIR}/dbus-1.0/include/dbus/ + install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/ +} + +do_install_append () { + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1 +} + +python populate_packages_prepend () { + if (bb.data.getVar('DEBIAN_NAMES', d, 1)): + bb.data.setVar('PKG_dbus', 'dbus-1', d) +} -- cgit v1.2.3 From 6f873a200f5003c2c8ff072b0bc6eddca74ce7a3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 22 Aug 2006 11:07:28 +0000 Subject: angstrom-2006.9: prefer dbus 0.92 --- conf/distro/angstrom-2006.9.conf | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 4f732ecc2a..4abeea6e9a 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -46,6 +46,8 @@ require conf/distro/include/preferred-opie-versions.inc # GPE require conf/distro/include/preferred-gpe-versions-2.8.inc +PREFERRED_PROVIDER_dbus-glib = "dbus-glib" + PREFERRED_VERSION_fontconfig = "2.3.95" PREFERRED_VERSION_freetype = "2.2.1" @@ -55,10 +57,12 @@ PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" require conf/distro/include/preferred-xorg-versions-X11R7.1.inc +PREFERRED_VERSION_xserver-kdrive = "1.1.0+git${SRCDATE}" #zap extra stuff taking place in $MACHINE.conf GPE_EXTRA_INSTALL = "" + # E require conf/distro/include/preferred-e-versions.inc @@ -120,7 +124,7 @@ PREFERRED_VERSION_busybox = "1.2.1" PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e" PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e" -PREFERRED_VERSION_dbus ?= "0.91" +PREFERRED_VERSION_dbus ?= "0.92" PREFERRED_VERSION_gstreamer ?= "0.10.6" PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" @@ -144,11 +148,11 @@ PCMCIA_MANAGER_h6300 = "pcmciautils" PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils" # add altboot to compatible models, will be replaced with angstrom-bootmanager -EXTRA_STUFF_append_c7x0 = "altboot" -EXTRA_STUFF_append_akita = "altboot" -EXTRA_STUFF_append_spitz = "altboot" -EXTRA_STUFF_append_poodle = "altboot" -EXTRA_STUFF_append_tosa = "altboot" +#EXTRA_STUFF_append_c7x0 = "altboot" +#EXTRA_STUFF_append_akita = "altboot" +#EXTRA_STUFF_append_spitz = "altboot" +#EXTRA_STUFF_append_poodle = "altboot" +#EXTRA_STUFF_append_tosa = "altboot" ### GPE section ### -- cgit v1.2.3 From 6977804fcbaf5869341ef9c41c95275784664bdd Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Tue, 22 Aug 2006 12:12:05 +0000 Subject: handhelds-pxa-2.6: add h4000 to supported list -close #1351 --- packages/linux/handhelds-pxa-2.6_cvs.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/handhelds-pxa-2.6_cvs.bb b/packages/linux/handhelds-pxa-2.6_cvs.bb index e00598d937..7dfcb4d237 100644 --- a/packages/linux/handhelds-pxa-2.6_cvs.bb +++ b/packages/linux/handhelds-pxa-2.6_cvs.bb @@ -3,10 +3,10 @@ DESCRIPTION = "handhelds.org Linux kernel for PXA based devices." MAINTAINER = "Greg Gilbert " LICENSE = "GPL" PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}" -PR = "r2" +PR = "r3" # COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = '(h3900|h5xxx|h2200|ipaq-pxa270|htcuniversal)' +COMPATIBLE_MACHINE = '(h3900|h5xxx|h2200|h4000|ipaq-pxa270|htcuniversal)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" -- cgit v1.2.3 From 083330ee5cebdee705f5e85bcfd7a9610fbfd756 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Tue, 22 Aug 2006 12:16:17 +0000 Subject: angstrom.conf: added h4000 support --- conf/distro/angstrom-2006.9.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 4abeea6e9a..ca7ddc873d 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -144,6 +144,7 @@ PCMCIA_MANAGER_tosa = "pcmciautils" PCMCIA_MANAGER_poodle = "pcmciautils" PCMCIA_MANAGER_nokia770 = "pcmciautils" PCMCIA_MANAGER_h2200 = "pcmciautils" +PCMCIA_MANAGER_h4000 = "pcmciautils" PCMCIA_MANAGER_h6300 = "pcmciautils" PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils" @@ -159,6 +160,7 @@ PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils" #Install libgtkinput in devices without a keyboard GPE_EXTRA_INSTALL_append_ipaq-pxa270 = " libgtkinput" GPE_EXTRA_INSTALL_append_h2200 = " libgtkinput" +GPE_EXTRA_INSTALL_append_h4000 = " libgtkinput" GPE_EXTRA_INSTALL_append_h6300 = " libgtkinput" GPE_EXTRA_INSTALL_append_simpad = " libgtkinput" GPE_EXTRA_INSTALL_append_nokia770 = " libgtkinput" -- cgit v1.2.3 From 6e93602d9bb4ffe35c5d7a2a7870b89c1e4fb630 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Tue, 22 Aug 2006 12:21:28 +0000 Subject: tslib: added h4000 support - close #1351 --- packages/tslib/tslib/h4000/.mtn2git_empty | 0 packages/tslib/tslib/h4000/tslib.sh | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 packages/tslib/tslib/h4000/.mtn2git_empty create mode 100644 packages/tslib/tslib/h4000/tslib.sh diff --git a/packages/tslib/tslib/h4000/.mtn2git_empty b/packages/tslib/tslib/h4000/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/tslib/tslib/h4000/tslib.sh b/packages/tslib/tslib/h4000/tslib.sh new file mode 100644 index 0000000000..0de3534a51 --- /dev/null +++ b/packages/tslib/tslib/h4000/tslib.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +module_id() { + awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' Date: Tue, 22 Aug 2006 12:24:56 +0000 Subject: matchbox-panel: added h4000 support - close #1351 --- packages/matchbox-panel/matchbox-panel.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/matchbox-panel/matchbox-panel.inc b/packages/matchbox-panel/matchbox-panel.inc index f82b66a0e9..16f471356a 100644 --- a/packages/matchbox-panel/matchbox-panel.inc +++ b/packages/matchbox-panel/matchbox-panel.inc @@ -11,6 +11,7 @@ EXTRA_OECONF = " --enable-startup-notification --enable-dnotify " EXTRA_OECONF_append_h3600 = " --enable-small-icons " EXTRA_OECONF_append_h3900 = " --enable-small-icons " EXTRA_OECONF_append_h2200 = " --enable-small-icons " +EXTRA_OECONF_append_h4000 = " --enable-small-icons " EXTRA_OECONF_append_collie = " --enable-small-icons " EXTRA_OECONF_append_poodle = " --enable-small-icons " EXTRA_OECONF_append_mnci = " --enable-small-icons " -- cgit v1.2.3 From 7451045df548189ba9cabf21eb71e9fe9543cb79 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Tue, 22 Aug 2006 12:41:54 +0000 Subject: h4000.conf: changes from #1266 --- conf/machine/h4000.conf | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf index bf653d9e97..410de9a100 100644 --- a/conf/machine/h4000.conf +++ b/conf/machine/h4000.conf @@ -2,13 +2,16 @@ #@NAME: HP iPAQ h4xxx #@DESCRIPTION: Machine configuration for the HP iPAQ h4xxx +INHERIT += "linux_modules" + TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm armv4 armv4t armv5e armv5te ipaqpxa" +IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa h4000" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" ROOT_FLASH_SIZE = "32" +PCMCIA_MANAGER = "pcmciautils" BOOT_MODULES = " ${@linux_module_packages('${H4000_MODULES}', d)}" BOOTSTRAP_EXTRA_RRECOMMENDS = " ${BOOT_MODULES}" @@ -21,16 +24,15 @@ H4000_MODULES = "g_ether g_serial g_file_storage snd-pcm-oss" module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_g_ether = "g_ether" -SERIAL_CONSOLE = "115200 tts/0 vt100" +SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -include conf/machine/ipaq-common.conf -include conf/machine/handheld-common.conf +include conf/machine/include/handheld-common.conf GUI_MACHINE_CLASS = "smallscreen" -include conf/machine/tune-xscale.conf +include conf/machine/include/tune-xscale.conf # LAB can only resolve relative symlinks ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; " -- cgit v1.2.3 From f7ede7909a386ab6bf2780c596d1287c2f9b0602 Mon Sep 17 00:00:00 2001 From: Kristoffer Ericson Date: Tue, 22 Aug 2006 14:29:59 +0000 Subject: conf/distro/jlime-donkey.conf: Added specific liblbxutil version --- conf/distro/jlime-donkey.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index 8375996133..e668c3ce38 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -36,6 +36,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-${MACHINE}" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/libx11 = "libx11" +PREFERRED_VERSION_liblbxutil = "X11R7.0-1.0.0" require conf/distro/include/preferred-xorg-versions-X11R7.1.inc -- cgit v1.2.3 From c22cd021e7c6eea88d7d76f4b7cebab803068b95 Mon Sep 17 00:00:00 2001 From: Kristoffer Ericson Date: Tue, 22 Aug 2006 14:34:15 +0000 Subject: xorg-lib/liblbxutil : Addition of 1.0.0 patch * Addition of mkg3states-1.0.0 patch that works with liblbxutil_X11R7.0-1.0.0 (correct directory layout for patch). --- .../xorg-lib/liblbxutil/mkg3states-1.0.0.patch | 54 ++++++++++++++++++++++ packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb | 2 + 2 files changed, 56 insertions(+) create mode 100644 packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch diff --git a/packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch b/packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch new file mode 100644 index 0000000000..afa34712e2 --- /dev/null +++ b/packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch @@ -0,0 +1,54 @@ +diff -ruN liblbxutil-X11R7.0-1.0.0_orig/configure.ac liblbxutil-X11R7.0-1.0.0/configure.ac +--- liblbxutil-X11R7.0-1.0.0_orig/configure.ac 2005-12-15 00:24:36.000000000 +0000 ++++ liblbxutil-X11R7.0-1.0.0/configure.ac 2006-08-21 18:32:04.000000000 +0000 +@@ -60,4 +60,5 @@ + + AC_OUTPUT([Makefile + src/Makefile ++ src/image/Makefile + lbxutil.pc]) +diff -ruN liblbxutil-X11R7.0-1.0.0_orig/src/Makefile.am liblbxutil-X11R7.0-1.0.0/src/Makefile.am +--- liblbxutil-X11R7.0-1.0.0_orig/src/Makefile.am 2005-10-16 02:07:10.000000000 +0000 ++++ liblbxutil-X11R7.0-1.0.0/src/Makefile.am 2006-08-21 18:32:04.000000000 +0000 +@@ -1,9 +1,6 @@ + lib_LTLIBRARIES = liblbxutil.la + +-noinst_PROGRAMS = mkg3states +- +-mkg3states_SOURCES = \ +- $(srcdir)/image/mkg3states.c ++SUBDIRS = image + + liblbxutil_la_SOURCES = \ + $(srcdir)/lbx_zlib/reqstats.h \ +@@ -28,9 +25,8 @@ + + $(srcdir)/image/dfaxg42d.c: g3states.h + +-g3states.h: mkg3states +- -rm -f g3states.h +- ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h ++g3states.h: image/mkg3states ++ ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h + + liblbxutil_la_LDFLAGS = -version-number 1:0:0 + +diff -ruN liblbxutil-X11R7.0-1.0.0_orig/src/image/Makefile.am liblbxutil-X11R7.0-1.0.0/src/image/Makefile.am +--- liblbxutil-X11R7.0-1.0.0_orig/src/image/Makefile.am 1970-01-01 00:00:00.000000000 +0000 ++++ liblbxutil-X11R7.0-1.0.0/src/image/Makefile.am 2006-08-21 18:32:04.000000000 +0000 +@@ -0,0 +1,15 @@ ++# evil hack ++CFLAGS=$(CFLAGS_FOR_BUILD) ++CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++LDFLAGS=$(LDFLAGS_FOR_BUILD) ++ ++CC=$(CC_FOR_BUILD) ++LIBTOOL = @LIBTOOL@ --tag=CC ++ ++noinst_PROGRAMS = mkg3states ++ ++mkg3states_SOURCES = \ ++ mkg3states.c ++ ++mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD) ++mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD) diff --git a/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb b/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb index df8b267601..57b2987968 100644 --- a/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb @@ -1,5 +1,7 @@ require xorg-lib-common.inc +SRC_URI += "file://mkg3states-1.0.0.patch;patch=0" + DESCRIPTION = "XFIXES Extension" DEPENDS += " xextproto xproto zlib" -- cgit v1.2.3 From 2f47add9ac03120f77cb0115215dbc473e9853f4 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 22 Aug 2006 13:19:22 +0000 Subject: keymaps: add h2200 keymap - finally close #1304 --- packages/keymaps/files/h2200/.mtn2git_empty | 0 packages/keymaps/files/h2200/keymap-2.6.map | 17 +++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 packages/keymaps/files/h2200/.mtn2git_empty create mode 100644 packages/keymaps/files/h2200/keymap-2.6.map diff --git a/packages/keymaps/files/h2200/.mtn2git_empty b/packages/keymaps/files/h2200/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/keymaps/files/h2200/keymap-2.6.map b/packages/keymaps/files/h2200/keymap-2.6.map new file mode 100644 index 0000000000..8b4c43fe0b --- /dev/null +++ b/packages/keymaps/files/h2200/keymap-2.6.map @@ -0,0 +1,17 @@ +# Kernel keymap for h2200 keys + +# Apps keys +keycode 67 = F9 +keycode 68 = F10 +keycode 87 = F11 +keycode 88 = F12 + +# Joypad +keycode 103 = Up +keycode 105 = Left +keycode 106 = Right +keycode 108 = Down +keycode 28 = Return + +# Power key +keycode 116 = F34 -- cgit v1.2.3 From 92415076b9a7601cec26eea72f9a6b6ac2ee848f Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 22 Aug 2006 15:47:27 +0000 Subject: gpe-screenshot: Add fix for segfault uploading files in current release. --- packages/gpe-screenshot/files/.mtn2git_empty | 0 packages/gpe-screenshot/files/fix-segfault.patch | 36 ++++++++++++++++++++++++ packages/gpe-screenshot/gpe-screenshot_0.4.bb | 3 ++ 3 files changed, 39 insertions(+) create mode 100644 packages/gpe-screenshot/files/.mtn2git_empty create mode 100644 packages/gpe-screenshot/files/fix-segfault.patch diff --git a/packages/gpe-screenshot/files/.mtn2git_empty b/packages/gpe-screenshot/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpe-screenshot/files/fix-segfault.patch b/packages/gpe-screenshot/files/fix-segfault.patch new file mode 100644 index 0000000000..dc185a9b51 --- /dev/null +++ b/packages/gpe-screenshot/files/fix-segfault.patch @@ -0,0 +1,36 @@ +Index: src/gpe-screenshot.c +=================================================================== +RCS file: /cvs/gpe/base/gpe-screenshot/src/gpe-screenshot.c,v +retrieving revision 1.1 +retrieving revision 1.2 +diff -u -r1.1 -r1.2 +--- src/gpe-screenshot.c 1 Nov 2005 20:54:38 -0000 1.1 ++++ src/gpe-screenshot.c 10 Aug 2006 15:07:21 -0000 1.2 +@@ -334,10 +334,9 @@ + { + GtkWidget *icon = gtk_image_new_from_stock (GTK_STOCK_JUMP_TO, GTK_ICON_SIZE_BUTTON); + +- g_object_set (mainDlg->ok_button, "use-stock", FALSE); +- g_object_set (mainDlg->ok_button, "use-underline", TRUE); +- g_object_set (mainDlg->ok_button, "label", "_Upload"); +- g_object_set (mainDlg->ok_button, "image", GTK_WIDGET (icon)); ++ gtk_button_set_use_stock (mainDlg->ok_button, FALSE); ++ gtk_button_set_label (mainDlg->ok_button, "_Upload"); ++ gtk_button_set_image (mainDlg->ok_button, icon); + + gtk_widget_set_sensitive (GTK_WIDGET (mainDlg->entry), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET (mainDlg->browse_button), FALSE); +@@ -347,10 +346,9 @@ + GtkWidget *icon = gtk_image_new_from_stock (GTK_STOCK_SAVE, GTK_ICON_SIZE_BUTTON); + + /* for some odd reason use-stock doesn't have any effect. set the image manually...*/ +- g_object_set (mainDlg->ok_button, "use-stock", TRUE); +- g_object_set (mainDlg->ok_button, "use-underline", TRUE); +- g_object_set (mainDlg->ok_button, "label", GTK_STOCK_SAVE); +- g_object_set (mainDlg->ok_button, "image", GTK_WIDGET (icon)); ++ gtk_button_set_label (mainDlg->ok_button, GTK_STOCK_SAVE); ++ gtk_button_set_use_stock (mainDlg->ok_button, TRUE); ++ gtk_button_set_image (mainDlg->ok_button, icon); + + gtk_widget_set_sensitive (GTK_WIDGET (mainDlg->entry), TRUE); + gtk_widget_set_sensitive (GTK_WIDGET (mainDlg->browse_button), TRUE); diff --git a/packages/gpe-screenshot/gpe-screenshot_0.4.bb b/packages/gpe-screenshot/gpe-screenshot_0.4.bb index 283d28d5aa..b64bdceb04 100644 --- a/packages/gpe-screenshot/gpe-screenshot_0.4.bb +++ b/packages/gpe-screenshot/gpe-screenshot_0.4.bb @@ -3,7 +3,10 @@ LICENSE = "GPL" PRIORITY = "optional" MAINTAINER = "Rene Wagner " SECTION = "gpe" +PR = "r1" DEPENDS = "glib-2.0 gtk+ libglade" inherit gpe autotools + +SRC_URI += "file://fix-segfault.patch;patch=1;pnum=0 " -- cgit v1.2.3 From 0dd3c8716fb82d8a3b9adc7eee784ea7b56bdc8b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 22 Aug 2006 20:51:18 +0000 Subject: wpa supplicant 0.4.7: change do_install to work with OE's install from coreutils-native --- packages/wpa-supplicant/wpa-supplicant_0.4.7.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/wpa-supplicant/wpa-supplicant_0.4.7.bb b/packages/wpa-supplicant/wpa-supplicant_0.4.7.bb index 268255c39e..03aa3f6d0d 100644 --- a/packages/wpa-supplicant/wpa-supplicant_0.4.7.bb +++ b/packages/wpa-supplicant/wpa-supplicant_0.4.7.bb @@ -26,13 +26,13 @@ do_compile () { do_install () { install -d ${D}${sbindir} - install -m755 wpa_supplicant ${D}${sbindir} - install -m755 wpa_passphrase ${D}${sbindir} - install -m755 wpa_cli ${D}${sbindir} + install -m 755 wpa_supplicant ${D}${sbindir} + install -m 755 wpa_passphrase ${D}${sbindir} + install -m 755 wpa_cli ${D}${sbindir} install -d ${D}${sysconfdir} - install -m644 ${WORKDIR}/wpa_supplicant.conf ${D}${sysconfdir} + install -m 644 ${WORKDIR}/wpa_supplicant.conf ${D}${sysconfdir} install -d ${D}${docdir}/wpa_supplicant - install -m644 README ${D}${docdir}/wpa_supplicant + install -m 644 README ${D}${docdir}/wpa_supplicant } -- cgit v1.2.3 From 013fe9f4f1391a683ac4db41ee1b5ea248ec46e9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 22 Aug 2006 22:06:31 +0000 Subject: task-angstrom: mask out broken packages --- packages/angstrom/task-angstrom.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb index c8c84c3e5e..731aca6772 100644 --- a/packages/angstrom/task-angstrom.bb +++ b/packages/angstrom/task-angstrom.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r17" +PR = "r18" ALLOW_EMPTY = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -142,7 +142,7 @@ RDEPENDS_angstrom-task-office := "\ gnumeric \ abiword \ imposter \ - evince \ +# evince \ gqview" RDEPENDS_angstrom-task-printing := "\ @@ -154,11 +154,11 @@ RDEPENDS_angstrom-task-sectest := "\ ettercap \ stunnel \ curl \ - dsniff \ +# dsniff \ prismstumbler \ - tcpdump \ +# tcpdump \ kismet \ hydra \ thcrut \ - driftnet \ +# driftnet \ miniclipboard" -- cgit v1.2.3 From 79979777735949ffe672199e8e8288a404c4c8dc Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 23 Aug 2006 11:13:21 +0000 Subject: wlan-ng: fixing to get it build and updated - close #1260 - added 0.2.4+svn20060823 - bumped SVN to 0.2.4 - SVN are DEFAULT_PREFERENCE = -1 now - dropped pcmcia-driver.patch from wlan-ng-modules.inc - for PCMCIA cards we use HostAP not wlan-ng --- .../.mtn2git_empty | 0 .../only-the-modules.patch | 26 ++++++++ packages/wlan-ng/wlan-ng-modules.inc | 1 - .../wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb | 8 +++ packages/wlan-ng/wlan-ng-modules_svn.bb | 5 +- .../wlan-ng-utils-0.2.4+svn20060823/.mtn2git_empty | 0 .../wlan-ng-utils-0.2.4+svn20060823/config.in | 21 +++++++ .../only-the-utils.patch | 26 ++++++++ .../wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb | 72 ++++++++++++++++++++++ packages/wlan-ng/wlan-ng-utils_svn.bb | 6 +- 10 files changed, 162 insertions(+), 3 deletions(-) create mode 100644 packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/.mtn2git_empty create mode 100644 packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/only-the-modules.patch create mode 100644 packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb create mode 100644 packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/.mtn2git_empty create mode 100644 packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/config.in create mode 100644 packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/only-the-utils.patch create mode 100644 packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/.mtn2git_empty b/packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/only-the-modules.patch b/packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/only-the-modules.patch new file mode 100644 index 0000000000..abb3b137da --- /dev/null +++ b/packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/only-the-modules.patch @@ -0,0 +1,26 @@ +Index: trunk/src/Makefile +=================================================================== +--- trunk.orig/src/Makefile 2006-08-23 12:50:56.000000000 +0200 ++++ trunk/src/Makefile 2006-08-23 12:52:45.000000000 +0200 +@@ -44,7 +44,7 @@ + + -include ../config.mk + +-DIRS=mkmeta shared wlanctl nwepgen wlancfg p80211 prism2 ++DIRS=mkmeta shared p80211 prism2 + + ifneq ($(wildcard *.addon),) + DIRS+=`cat *.addon` +Index: trunk/src/prism2/Makefile +=================================================================== +--- trunk.orig/src/prism2/Makefile 2006-08-23 12:50:55.000000000 +0200 ++++ trunk/src/prism2/Makefile 2006-08-23 12:52:09.000000000 +0200 +@@ -44,7 +44,7 @@ + + -include ../../config.mk + +-DIRS=driver ridlist download ++DIRS=driver ridlist + + ifneq ($(wildcard *.addon),) + DIRS+=`cat *.addon` diff --git a/packages/wlan-ng/wlan-ng-modules.inc b/packages/wlan-ng/wlan-ng-modules.inc index 623275c921..9a0797fb00 100644 --- a/packages/wlan-ng/wlan-ng-modules.inc +++ b/packages/wlan-ng/wlan-ng-modules.inc @@ -13,7 +13,6 @@ SRC_URI = "file://no-compat.patch;patch=1 \ # file://module_param_array.patch;patch=1 \ file://scripts-makefile-hostcc.patch;patch=1 \ file://pcmciasrc.patch;patch=1 \ - file://pcmcia-driver.patch;patch=1 \ file://config.in" inherit module diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb b/packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb new file mode 100644 index 0000000000..ade99ac50d --- /dev/null +++ b/packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb @@ -0,0 +1,8 @@ +require wlan-ng-modules.inc + +SRCDATE = "20060823" +PV = "0.2.4+svn${SRCDATE}" + +SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk " +S = "${WORKDIR}/trunk" + diff --git a/packages/wlan-ng/wlan-ng-modules_svn.bb b/packages/wlan-ng/wlan-ng-modules_svn.bb index e932ee7df0..a1826a36f3 100644 --- a/packages/wlan-ng/wlan-ng-modules_svn.bb +++ b/packages/wlan-ng/wlan-ng-modules_svn.bb @@ -1,7 +1,10 @@ require wlan-ng-modules.inc PR = "r0" -PV = "0.2.3+svn${SRCDATE}" +PV = "0.2.4+svn${SRCDATE}" SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk " S = "${WORKDIR}/trunk" +DEFAULT_PREFERENCE = "-1" + +FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${PN}-0.2.4+svn20060823', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}/wlan-ng-modules' ], d)}" diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/.mtn2git_empty b/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/config.in b/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/config.in new file mode 100644 index 0000000000..be01488a92 --- /dev/null +++ b/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/config.in @@ -0,0 +1,21 @@ +WLAN_VERSION=0 +WLAN_PATCHLEVEL=2 +WLAN_SUBLEVEL=3 +WLAN_EXTRAVERSION= +#LINUX_SRC=$(KERNEL_SOURCE) +PCMCIA_SRC=. +PREFIX= +INST_EXEDIR=/sbin +#TARGET_ROOT_ON_HOST= +#RC_DIR=/etc/init.d +PCMCIA_DIR=/etc/pcmcia +SYSV_INIT=y +INSTALL_DEPMOD= +WLAN_DEBUG=n +CROSS_COMPILE_ENABLED=n +CROSS_COMPILE= +HOST_COMPILE= +PRISM2_PLX=y +PRISM2_PCMCIA=y +PRISM2_PCI=y +PRISM2_USB=y diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/only-the-utils.patch b/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/only-the-utils.patch new file mode 100644 index 0000000000..af1f442a4c --- /dev/null +++ b/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/only-the-utils.patch @@ -0,0 +1,26 @@ +Index: trunk/src/Makefile +=================================================================== +--- trunk.orig/src/Makefile 2006-08-21 16:24:58.000000000 +0200 ++++ trunk/src/Makefile 2006-08-23 12:49:08.000000000 +0200 +@@ -44,7 +44,7 @@ + + -include ../config.mk + +-DIRS=mkmeta shared wlanctl nwepgen wlancfg p80211 prism2 ++DIRS=mkmeta shared wlanctl nwepgen wlancfg prism2 + + ifneq ($(wildcard *.addon),) + DIRS+=`cat *.addon` +Index: trunk/src/prism2/Makefile +=================================================================== +--- trunk.orig/src/prism2/Makefile 2006-08-21 16:24:57.000000000 +0200 ++++ trunk/src/prism2/Makefile 2006-08-23 12:48:32.000000000 +0200 +@@ -44,7 +44,7 @@ + + -include ../../config.mk + +-DIRS=driver ridlist download ++DIRS=ridlist download + + ifneq ($(wildcard *.addon),) + DIRS+=`cat *.addon` diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb b/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb new file mode 100644 index 0000000000..27cb04e97f --- /dev/null +++ b/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb @@ -0,0 +1,72 @@ +DESCRIPTION = "linux-wlan-ng userland utilities" +HOMEPAGE = "http://www.linux-wlan.org" +SECTION = "kernel/userland" +DEPENDS = "virtual/kernel" +LICENSE = "GPL" + +SRCDATE = "20060823" +PV = "0.2.4+svn${SRCDATE}" + +SRC_URI = "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \ + file://only-the-utils.patch;patch=1 \ + file://scripts-makefile-hostcc.patch;patch=1 \ + file://pcmciasrc.patch;patch=1 \ + file://hostldflags.patch;patch=1 \ + file://wlan-ng.modutils \ + file://wlan.agent \ + file://usbctl \ + file://resume \ + file://pre-up \ + file://post-down \ + file://config.in" +S = "${WORKDIR}/trunk" + +# yeah, it's kind of backwards, but otherwise the config step will fail +inherit module + +do_configure() { + install -m 0655 ${WORKDIR}/config.in ${S}/config.in + oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config + + if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then + echo "PRISM2_PCMCIA=y" >> config.mk + echo "WLAN_KERN_PCMCIA=y" >> config.mk + fi + echo "TARGET_ROOT_ON_HOST=${D}/" >> config.mk + echo "FIRMWARE_DIR=/etc/wlan" >> config.mk + echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk + echo "TARGET_INST_EXEDIR=${D}/sbin" >> config.mk + echo "RC_DIR=${sysconfdir}/" >> config.mk + echo "CC=${CC}" >> config.mk + echo "LD=${LD}" >> config.mk + + # Shut up, you broken buildsystem + install -m 0655 config.mk src/prism2/config.mk + install -d src/prism2/driver/include + ln -sf ${S}/src/include/wlan src/prism2/driver/include/wlan + ln -sf ${S}/src/prism2/include/prism2 src/prism2/driver/include/prism2 +} + +do_compile() { + oe_runmake all +} + +do_install() { + oe_runmake install + mkdir -p ${D}${sysconfdir}/modutils/ + mkdir -p ${D}${sysconfdir}/hotplug/ + mkdir -p ${D}${base_sbindir}/ + install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}${sysconfdir}/modutils/wlan-ng.conf + install -m 0755 ${WORKDIR}/wlan.agent ${D}${sysconfdir}/hotplug/wlan.agent + install -d ${D}${sysconfdir}/network/if-pre-up.d + install -m 0755 ${WORKDIR}/pre-up ${D}${sysconfdir}/network/if-pre-up.d/wlan-ng + install -d ${D}${sysconfdir}/network/if-post-down.d + install -m 0755 ${WORKDIR}/post-down ${D}${sysconfdir}/network/if-post-down.d/wlan-ng + install -d ${D}${sysconfdir}/apm/resume.d + install -m 0755 ${WORKDIR}/resume ${D}${sysconfdir}/apm/resume.d/wlan-ng + install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl + install -d ${D}${mandir}/man1 + install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/ +} + +FILES_${PN} = "/etc /sbin" diff --git a/packages/wlan-ng/wlan-ng-utils_svn.bb b/packages/wlan-ng/wlan-ng-utils_svn.bb index bf9522fa38..c85779abc2 100644 --- a/packages/wlan-ng/wlan-ng-utils_svn.bb +++ b/packages/wlan-ng/wlan-ng-utils_svn.bb @@ -4,7 +4,7 @@ SECTION = "kernel/userland" DEPENDS = "virtual/kernel" LICENSE = "GPL" PR = "r2" -PV = "0.2.3+svn${SRCDATE}" +PV = "0.2.4+svn${SRCDATE}" SRC_URI = "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \ file://only-the-utils.patch;patch=1 \ @@ -69,3 +69,7 @@ do_install() { } FILES_${PN} = "/etc /sbin" + +DEFAULT_PREFERENCE = "-1" + +FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${PN}-0.2.4+svn20060823', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}/wlan-ng-utils' ], d)}" -- cgit v1.2.3 From 5ff7890de244fdadae4ff39da764356be1316d5f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 23 Aug 2006 11:19:12 +0000 Subject: mesa 6.4.1: add a hack to use 'gcc' for building gen_matypes on x86 --- packages/mesa/mesa_6.4.1+cvs20060101.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/mesa/mesa_6.4.1+cvs20060101.bb b/packages/mesa/mesa_6.4.1+cvs20060101.bb index aca9331e00..6e9a99144b 100644 --- a/packages/mesa/mesa_6.4.1+cvs20060101.bb +++ b/packages/mesa/mesa_6.4.1+cvs20060101.bb @@ -25,6 +25,7 @@ do_configure() { sed -e "s%OPT_FLAGS *= *.*%OPT_FLAGS = ${TARGET_CFLAGS}%" -i current sed -e "s%X11_INCLUDES *= *.*%X11_INCLUDES = -I${STAGING_INCDIR}/X11%" -i current sed -e "s%EXTRA_LIB_PATH *= *.*%EXTRA_LIB_PATH = ${LDFLAGS}%" -i current + sed -i s:\$\(CC\):gcc:g ../src/mesa/x86/Makefile echo "SRC_DIRS = mesa glu glut/glx" >> current } -- cgit v1.2.3 From f4b18fced24ea7704b429db86f7638a779079407 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 23 Aug 2006 12:29:20 +0000 Subject: base.bbclass: Remove empty messages --- classes/base.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index 56a13ff309..6f8468b119 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -543,7 +543,8 @@ python base_eventhandler() { msg += messages.get(name[5:]) or name[5:] elif name == "UnsatisfiedDep": msg += "package %s: dependency %s %s" % (e.pkg, e.dep, name[:-3].lower()) - note(msg) + if msg: + note(msg) if name.startswith("BuildStarted"): bb.data.setVar( 'BB_VERSION', bb.__version__, e.data ) -- cgit v1.2.3 From 36eac0c5866ae3632436d51f5d2b9fae884a1238 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 23 Aug 2006 12:30:23 +0000 Subject: task-angstrom: split it up a bit --- packages/angstrom/task-angstrom.bb | 115 +------------------------------------ 1 file changed, 3 insertions(+), 112 deletions(-) diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb index 731aca6772..1e1bc5a41a 100644 --- a/packages/angstrom/task-angstrom.bb +++ b/packages/angstrom/task-angstrom.bb @@ -12,16 +12,7 @@ PCMCIA_MANAGER ?= "pcmciautils" PACKAGES = "\ angstrom-base-depends \ - angstrom-base-wifi \ - angstrom-x11-base-depends \ - angstrom-gpe-task-base \ - angstrom-gpe-task-settings \ - angstrom-gpe-task-pim \ - angstrom-gpe-task-apps \ - angstrom-gpe-task-games \ - angstrom-task-office \ - angstrom-task-printing \ - angstrom-task-sectest" + angstrom-base-wifi " RDEPENDS_angstrom-base-depends = "\ base-files keymaps \ @@ -42,7 +33,8 @@ RDEPENDS_angstrom-base-depends = "\ " RDEPENDS_angstrom-base-depends_append_ipaq-pxa270 = " tiinit acx-firmware " - +RDEPENDS_angstrom-base-depends_append_h4000 = " tiinit acx-firmware " +RDEPENDS_angstrom-base-depends_append_htcuniversal = " tiinit acx-firmware " RRECOMMENDS_angstrom-base-depends = "\ ${BOOTMODULES_RRECOMMENDS} \ @@ -58,107 +50,6 @@ RDEPENDS_angstrom-base-wifi = "\ hostap-conf \ prism3-support \ prism3-firmware \ - acx-firmware \ wireless-tools \ wpa-supplicant \ " - -RDEPENDS_angstrom-x11-base-depends := "\ - virtual/libx11 \ - virtual/xserver \ - ttf-dejavu-sans \ - ttf-dejavu-sans-mono \ - " - -RDEPENDS_angstrom-gpe-task-base := "\ - matchbox \ - xcursor-transparent-theme \ - rxvt-unicode \ - matchbox-themes-gtk \ - xst \ - xhost \ - xrdb \ - gpe-soundserver \ - gpe-dm \ - gpe-login \ - gpe-session-scripts \ - gpe-icons \ - gpe-confd \ - gpe-autostarter \ - libgtkstylus \ - libgtkinput \ - suspend-desktop \ - teleport \ - xauth \ - gdk-pixbuf-loader-png \ - gdk-pixbuf-loader-xpm \ - gdk-pixbuf-loader-jpeg \ - pango-module-basic-x \ - pango-module-basic-fc" - -RDEPENDS_angstrom-gpe-task-pim := "\ - gpe-timesheet \ - gpe-todo \ - gpe-calendar \ - gpe-contacts \ - gpesyncd" - -RDEPENDS_angstrom-gpe-task-settings := "\ - matchbox-panel-manager \ - gpe-su \ - gpe-conf \ - gpe-package \ - gpe-shield \ - gpe-taskmanager \ - minilite \ - minimix \ - xmonobut" - -RDEPENDS_angstrom-gpe-task-apps := "\ - gpe-edit \ - gpe-gallery \ - gpe-calculator \ - gpe-clock \ - gpe-plucker \ - gpe-terminal \ - gpe-watch \ - gpe-what \ - matchbox-panel-hacks \ - gpe-aerial \ - gpe-soundbite \ - rosetta \ - gpe-screenshot \ - gpe-windowlist" - -RDEPENDS_angstrom-gpe-task-games := "\ - gpe-go \ - gpe-lights \ - gpe-othello \ - gpe-tetris \ - gsoko \ - xdemineur" - -RDEPENDS_angstrom-task-office := "\ - gnumeric \ - abiword \ - imposter \ -# evince \ - gqview" - -RDEPENDS_angstrom-task-printing := "\ - cups \ - gnome-cups-manager" - -RDEPENDS_angstrom-task-sectest := "\ - nmap \ - ettercap \ - stunnel \ - curl \ -# dsniff \ - prismstumbler \ -# tcpdump \ - kismet \ - hydra \ - thcrut \ -# driftnet \ - miniclipboard" -- cgit v1.2.3 From 45505ada9046cbae20b3bc79254adf27285dc095 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 23 Aug 2006 12:38:11 +0000 Subject: task-angstrom-x11.bb: add missing file --- packages/angstrom/task-angstrom-x11.bb | 118 +++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) create mode 100644 packages/angstrom/task-angstrom-x11.bb diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb new file mode 100644 index 0000000000..55d644bc15 --- /dev/null +++ b/packages/angstrom/task-angstrom-x11.bb @@ -0,0 +1,118 @@ +DESCRIPTION = "Task packages for the Angstrom distribution" +PR = "r19" +ALLOW_EMPTY = "1" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +DEPENDS = "task-angstrom" + +PACKAGES = "\ + angstrom-x11-base-depends \ + angstrom-gpe-task-base \ + angstrom-gpe-task-settings \ + angstrom-gpe-task-pim \ + angstrom-gpe-task-apps \ + angstrom-gpe-task-games \ + angstrom-task-office \ + angstrom-task-printing \ + angstrom-task-sectest" + +RDEPENDS_angstrom-x11-base-depends := "\ + virtual/libx11 \ + virtual/xserver \ + ttf-dejavu-sans \ + ttf-dejavu-sans-mono \ + " + +RDEPENDS_angstrom-gpe-task-base := "\ + matchbox \ + xcursor-transparent-theme \ + rxvt-unicode \ + matchbox-themes-gtk \ + xst \ + xhost \ + xrdb \ + gpe-soundserver \ + gpe-dm \ + gpe-login \ + gpe-session-scripts \ + gpe-icons \ + gpe-confd \ + gpe-autostarter \ + libgtkstylus \ + libgtkinput \ + suspend-desktop \ + teleport \ + xauth \ + gdk-pixbuf-loader-png \ + gdk-pixbuf-loader-xpm \ + gdk-pixbuf-loader-jpeg \ + pango-module-basic-x \ + pango-module-basic-fc" + +RDEPENDS_angstrom-gpe-task-pim := "\ + gpe-timesheet \ + gpe-todo \ + gpe-calendar \ + gpe-contacts \ + gpesyncd" + +RDEPENDS_angstrom-gpe-task-settings := "\ + matchbox-panel-manager \ + gpe-su \ + gpe-conf \ + gpe-package \ + gpe-shield \ + gpe-taskmanager \ + minilite \ + minimix \ + xmonobut" + +RDEPENDS_angstrom-gpe-task-apps := "\ + gpe-edit \ + gpe-gallery \ + gpe-calculator \ + gpe-clock \ + gpe-plucker \ + gpe-terminal \ + gpe-watch \ + gpe-what \ + matchbox-panel-hacks \ + gpe-aerial \ + gpe-soundbite \ + rosetta \ + gpe-screenshot \ + gpe-windowlist" + +RDEPENDS_angstrom-gpe-task-games := "\ + gpe-go \ + gpe-lights \ + gpe-othello \ + gpe-tetris \ + gsoko \ + xdemineur" + +RDEPENDS_angstrom-task-office := "\ + gnumeric \ + abiword \ + imposter \ +# evince \ + gqview" + +RDEPENDS_angstrom-task-printing := "\ + cups \ + gnome-cups-manager" + +RDEPENDS_angstrom-task-sectest := "\ + nmap \ + ettercap \ + stunnel \ + curl \ +# dsniff \ + prismstumbler \ +# tcpdump \ + kismet \ + hydra \ + thcrut \ +# driftnet \ + miniclipboard" -- cgit v1.2.3 From 3dbc77ba5d5b9e8cc505794f8253ccdd62a50031 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 23 Aug 2006 13:35:34 +0000 Subject: task-angstrom: add wifi modules for wep/wpa --- packages/angstrom/task-angstrom.bb | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb index 1e1bc5a41a..249448652a 100644 --- a/packages/angstrom/task-angstrom.bb +++ b/packages/angstrom/task-angstrom.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r18" +PR = "r19" ALLOW_EMPTY = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -46,10 +46,20 @@ RRECOMMENDS_angstrom-base-depends = "\ " RDEPENDS_angstrom-base-wifi = "\ - hostap-utils \ - hostap-conf \ - prism3-support \ - prism3-firmware \ - wireless-tools \ - wpa-supplicant \ - " + hostap-utils \ + hostap-conf \ + prism3-support \ + prism3-firmware \ + wireless-tools \ + wpa-supplicant \ + " + +RRECOMMENDS_angstrom-base-wifi = "\ + kernel-module-arc4 \ + kernel-module-michael-mic \ + kernel-module-aes \ + kernel-module-ieee80211-crypt-tkip \ + kernel-module-ieee80211-crypt-wep \ + kernel-module-ieee80211-crypt \ + kernel-module-ieee80211-crypt-ccmp \ + " -- cgit v1.2.3 From d1ce225959bd7189b6b790b67ce9d282e2b5da0c Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 23 Aug 2006 13:38:40 +0000 Subject: task-angstrom: cleanup WiFi a bit - added all kernel modules needed for WEP/WPA - task-base RDEPEND on task-base-wifi --- packages/angstrom/task-angstrom.bb | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb index 1e1bc5a41a..79f6c4752e 100644 --- a/packages/angstrom/task-angstrom.bb +++ b/packages/angstrom/task-angstrom.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r18" +PR = "r19" ALLOW_EMPTY = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -16,7 +16,7 @@ PACKAGES = "\ RDEPENDS_angstrom-base-depends = "\ base-files keymaps \ - base-passwd tinylogin \ + base-passwd tinylogin \ busybox \ udev \ update-modules module-init-tools modutils-initscripts \ @@ -24,12 +24,12 @@ RDEPENDS_angstrom-base-depends = "\ netbase dropbear \ angstrom-version \ ipkg ipkg-collateral \ - wireless-tools \ tslib-tests tslib-calibrate \ util-linux-mount util-linux-umount \ ${EXTRA_STUFF} \ ${DEBUG_APPS} \ - ${PCMCIA_MANAGER} \ + ${PCMCIA_MANAGER} \ + angstrom-base-wifi \ " RDEPENDS_angstrom-base-depends_append_ipaq-pxa270 = " tiinit acx-firmware " @@ -37,13 +37,12 @@ RDEPENDS_angstrom-base-depends_append_h4000 = " tiinit acx-firmware " RDEPENDS_angstrom-base-depends_append_htcuniversal = " tiinit acx-firmware " RRECOMMENDS_angstrom-base-depends = "\ - ${BOOTMODULES_RRECOMMENDS} \ - kernel-module-evdev \ - kernel-module-uinput \ - kernel-module-g-ether \ - kernel-module-hostap-cs \ - kernel-module-af-packet \ - " + ${BOOTMODULES_RRECOMMENDS} \ + kernel-module-evdev \ + kernel-module-uinput \ + kernel-module-g-ether \ + kernel-module-af-packet \ +" RDEPENDS_angstrom-base-wifi = "\ hostap-utils \ @@ -53,3 +52,16 @@ RDEPENDS_angstrom-base-wifi = "\ wireless-tools \ wpa-supplicant \ " + +RRECOMMENDS_angstrom-base-wifi = "\ + kernel-module-hostap-cs \ + kernel-module-orinoco-cs \ + kernel-module-spectrum-cs \ + kernel-module-arc4 \ + kernel-module-michael-mic \ + kernel-module-aes \ + kernel-module-ieee80211-crypt-tkip \ + kernel-module-ieee80211-crypt-wep \ + kernel-module-ieee80211-crypt \ + kernel-module-ieee80211-crypt-ccmp \ +" -- cgit v1.2.3 From 756b6ca023076aea5b8994ba56a735bbf7acd4db Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 23 Aug 2006 16:33:40 +0000 Subject: gpe autostarter: add 0.12 --- packages/gpe-autostarter/gpe-autostarter_0.12.bb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 packages/gpe-autostarter/gpe-autostarter_0.12.bb diff --git a/packages/gpe-autostarter/gpe-autostarter_0.12.bb b/packages/gpe-autostarter/gpe-autostarter_0.12.bb new file mode 100644 index 0000000000..5e6fe34c10 --- /dev/null +++ b/packages/gpe-autostarter/gpe-autostarter_0.12.bb @@ -0,0 +1,6 @@ +LICENSE = "GPL" +SECTION = "gpe" +DEPENDS = "glib-2.0 dbus hotplug-dbus virtual/libx11" +RDEPENDS = "hotplug-dbus" + +inherit gpe -- cgit v1.2.3 From b697506f185ada19061908cb424a8b0e6dd80b56 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 23 Aug 2006 16:37:17 +0000 Subject: gpe-beam: add 0.2.9 --- packages/gpe-beam/gpe-beam_0.2.9.bb | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 packages/gpe-beam/gpe-beam_0.2.9.bb diff --git a/packages/gpe-beam/gpe-beam_0.2.9.bb b/packages/gpe-beam/gpe-beam_0.2.9.bb new file mode 100644 index 0000000000..d21b18d84a --- /dev/null +++ b/packages/gpe-beam/gpe-beam_0.2.9.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "GPE infrared communication applet" +DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus" +RDEPENDS = "irda-utils" +SECTION = "gpe" +PRIORITY = "optional" +MAINTAINER = "Florian Boor " +LICENSE = "GPL" + +inherit gpe + -- cgit v1.2.3 From fa3d91da9dd083ca1f3077b4a24d8af111fb063f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 23 Aug 2006 17:03:31 +0000 Subject: gpe-edit: update to 0.32 --- packages/gpe-edit/gpe-edit_0.32.bb | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 packages/gpe-edit/gpe-edit_0.32.bb diff --git a/packages/gpe-edit/gpe-edit_0.32.bb b/packages/gpe-edit/gpe-edit_0.32.bb new file mode 100644 index 0000000000..af59b81e43 --- /dev/null +++ b/packages/gpe-edit/gpe-edit_0.32.bb @@ -0,0 +1,7 @@ +MAINTAINER = "Phil Blundell " +SECTION = "gpe"DESCRIPTION = "Editor for the GPE Palmtop Environment" +LICENSE = "GPL" + +DEPENDS = "gtk+ libgpewidget" + +inherit gpe -- cgit v1.2.3 From 022d3e6b1d0653c1102424168d49fabfc9e4ccc0 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 23 Aug 2006 18:08:45 +0000 Subject: firefox 1.5: put debug files in the -dbg package, the main package still has empty debug dirs: koen@bitbake:/data/build/koen/OE/build/tmp/angstrom/deploy/ipk$ ar x firefox_1.5.0.6-r1_armv5te.ipk ; tar ztvf data.tar.gz | grep debug drwxr-xr-x root/root 0 2006-08-23 20:07 ./usr/lib/firefox-1.5.0.6/components/.debug/ drwxr-xr-x root/root 0 2006-08-23 20:07 ./usr/lib/firefox-1.5.0.6/plugins/.debug/ drwxr-xr-x root/root 0 2006-08-23 20:07 ./usr/lib/firefox-1.5.0.6/extensions/inspector@mozilla.org/components/.debug/ --- packages/mozilla/firefox.inc | 7 ++++++- packages/mozilla/firefox_1.5.0.6.bb | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/mozilla/firefox.inc b/packages/mozilla/firefox.inc index f182086352..508919811a 100644 --- a/packages/mozilla/firefox.inc +++ b/packages/mozilla/firefox.inc @@ -2,8 +2,13 @@ SRC_URI += "file://mozilla-firefox.png file://mozilla-firefox.desktop" PACKAGES =+ "firefox-inspector" FILES_firefox-inspector = "${libdir}/firefox-${PV}/chrome/inspector" -FILES_${PN} = "${bindir}/firefox ${datadir}/applications ${datadir}/pixmaps ${libdir}/firefox-${PV} ${bindir}/defaults" +FILES_${PN} = "${bindir}/firefox ${datadir}/applications/ ${datadir}/pixmaps/ ${libdir}/firefox-${PV}/* ${bindir}/defaults" FILES_${PN}-dev += "${datadir}/idl ${bindir}/firefox-config" +FILES_${PN}-dbg += " ${libdir}/firefox-${PV}/.debug \ + ${libdir}/firefox-${PV}/*/.debug \ + ${libdir}/firefox-${PV}/*/*/*/.debug \ + ${bindir}/.debug \ + " do_install() { oe_runmake DESTDIR="${D}" destdir="${D}" install diff --git a/packages/mozilla/firefox_1.5.0.6.bb b/packages/mozilla/firefox_1.5.0.6.bb index 8f888db5ca..5f21212bd5 100644 --- a/packages/mozilla/firefox_1.5.0.6.bb +++ b/packages/mozilla/firefox_1.5.0.6.bb @@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \ file://xptcstubs.patch;patch=1 \ file://no-xmb.patch;patch=1 \ -- cgit v1.2.3 From 488bf9ffaebb63ff512f09129791988ba5a1edfd Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 23 Aug 2006 18:23:33 +0000 Subject: firefox.inc: put inspector bits in the inspector package --- packages/mozilla/firefox.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/mozilla/firefox.inc b/packages/mozilla/firefox.inc index 508919811a..bd0322334d 100644 --- a/packages/mozilla/firefox.inc +++ b/packages/mozilla/firefox.inc @@ -1,7 +1,11 @@ SRC_URI += "file://mozilla-firefox.png file://mozilla-firefox.desktop" PACKAGES =+ "firefox-inspector" -FILES_firefox-inspector = "${libdir}/firefox-${PV}/chrome/inspector" +FILES_firefox-inspector = " ${libdir}/firefox-${PV}/chrome/inspector* \ + ${libdir}/firefox-${PV}/components/*nspector* \ + ${libdir}/firefox-${PV}/extensions/inspector* \ + ${libdir}/firefox-${PV}/defaults/preferences/inspector* \ + " FILES_${PN} = "${bindir}/firefox ${datadir}/applications/ ${datadir}/pixmaps/ ${libdir}/firefox-${PV}/* ${bindir}/defaults" FILES_${PN}-dev += "${datadir}/idl ${bindir}/firefox-config" FILES_${PN}-dbg += " ${libdir}/firefox-${PV}/.debug \ -- cgit v1.2.3