diff options
author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-12 20:04:58 +0000 |
---|---|---|
committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-12 20:04:58 +0000 |
commit | dc2e799a19a5d57c1ae2bcf8844601245c06b6d0 (patch) | |
tree | 04c3e5f4efaea707aa40d0c00f4780187d71c6d0 | |
parent | d136678e618e308ee7a47a1650102a9886fafcb2 (diff) | |
parent | 9b6534ba102d9b548d31665f1afa9149128a55b7 (diff) |
merge of '8e8bab6fb50f5098375feebdb8f5e06408bc3e2e'
and 'fa0c91a57dfd0c1ecb6d5eeb7b1f12db5973ca2a'
23 files changed, 109 insertions, 68 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index e9dfd1dac8..c5e8d3249e 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -8,7 +8,7 @@ #DISTRO_VERSION = "2007.3" DISTRO_VERSION = "test-${DATE}" -DISTRO_REVISION = "30" +DISTRO_REVISION = "32" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -46,6 +46,10 @@ FEED_ARCH_poodle = "armv5te" FEED_ARCH_spitz = "armv5te" FEED_ARCH_tosa = "armv5te" + +#i586 machines +FEED_ARCH_epia = "i586" + #i686 machines FEED_ARCH_guinness = "i686" @@ -135,6 +139,7 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" PREFERRED_PROVIDER_gconf ?= "gconf-dbus" PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs" +PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs" PREFERRED_PROVIDER_tslib ?= "tslib" PREFERRED_PROVIDER_tslib-conf ?= "tslib" PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" diff --git a/conf/distro/include/preferred-gpe-versions-2.7.inc b/conf/distro/include/preferred-gpe-versions-2.7.inc index 662dfc386f..cbdaec0a21 100644 --- a/conf/distro/include/preferred-gpe-versions-2.7.inc +++ b/conf/distro/include/preferred-gpe-versions-2.7.inc @@ -7,7 +7,7 @@ #set some preferred providers: PREFERRED_PROVIDER_gconf="gconf-dbus" -PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus" +PREFERRED_PROVIDER_gnome-vfs="gnome-vfs" #specify versions, as the header says :) PREFERRED_VERSION_libmatchbox ?= "1.7" diff --git a/conf/distro/include/preferred-gpe-versions-2.8.inc b/conf/distro/include/preferred-gpe-versions-2.8.inc index bf00aa8d01..a246633e07 100644 --- a/conf/distro/include/preferred-gpe-versions-2.8.inc +++ b/conf/distro/include/preferred-gpe-versions-2.8.inc @@ -4,7 +4,7 @@ #set some preferred providers: PREFERRED_PROVIDER_gconf="gconf-dbus" -PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus" +PREFERRED_PROVIDER_gnome-vfs="gnome-vfs" PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904" diff --git a/conf/distro/include/preferred-gpe-versions.inc b/conf/distro/include/preferred-gpe-versions.inc index 7d4efea06e..5db9d7f06a 100644 --- a/conf/distro/include/preferred-gpe-versions.inc +++ b/conf/distro/include/preferred-gpe-versions.inc @@ -7,7 +7,7 @@ #set some preferred providers: PREFERRED_PROVIDER_gconf="gconf-dbus" -PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus" +PREFERRED_PROVIDER_gnome-vfs="gnome-vfs" #specify versions, as the header says :) #PREFERRED_VERSION_libmatchbox ?= "1.6" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index f73fa22e34..866741479f 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -46,7 +46,7 @@ SRCDATE_gpesyncd ?= "20061128" # GNOME SRCDATE_gconf-dbus ?= "20060719" -SRCDATE_gnome-vfs-dbus ?= "20060119" +SRCDATE_gnome-vfs ?= "20060119" SRCDATE_gtkhtml2 ?= "20060323" #Misc apps, sorted by alphabet diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf index 189021747a..86e9429506 100644 --- a/conf/machine/epia.conf +++ b/conf/machine/epia.conf @@ -1,13 +1,12 @@ TARGET_ARCH = "i586" -TARGET_VENDOR = "-oe" +PACKAGE_EXTRA_ARCHS = "i386 i486" + PREFERRED_PROVIDER_virtual/kernel = "linux-epia" -IMAGE_FSTYPES = "ext2.gz" -BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev kernel-modules" -udevdir = "/dev" OLDEST_KERNEL = "2.6.5" -GLIBC_ADDONS = "nptl" -GLIBC_EXTRA_OECONF = "--with-tls" -PACKAGE_EXTRA_ARCHS = "i386" + +IMAGE_FSTYPES = "ext2.gz" + +MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" require conf/machine/include/tune-c3.conf diff --git a/packages/gpe-beam/gpe-beam.inc b/packages/gpe-beam/gpe-beam.inc new file mode 100644 index 0000000000..5ca6df0b03 --- /dev/null +++ b/packages/gpe-beam/gpe-beam.inc @@ -0,0 +1,5 @@ +DESCRIPTION = "GPE infrared communication applet" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib" diff --git a/packages/gpe-beam/gpe-beam_0.2.3.bb b/packages/gpe-beam/gpe-beam_0.2.3.bb index b009b10372..e5861f069a 100644 --- a/packages/gpe-beam/gpe-beam_0.2.3.bb +++ b/packages/gpe-beam/gpe-beam_0.2.3.bb @@ -1,7 +1,5 @@ -inherit gpe pkgconfig -LICENSE = "GPL" -DESCRIPTION = "GPE infrared communication applet" -DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex" +require ${PN}.inc + RDEPENDS = "libopenobex-1.0-1" -SECTION = "gpe" -PRIORITY = "optional" + +inherit gpe pkgconfig diff --git a/packages/gpe-beam/gpe-beam_0.2.6.bb b/packages/gpe-beam/gpe-beam_0.2.6.bb index 71af4db7e6..89f8e8230a 100644 --- a/packages/gpe-beam/gpe-beam_0.2.6.bb +++ b/packages/gpe-beam/gpe-beam_0.2.6.bb @@ -1,12 +1,8 @@ -PR = "r1" - -inherit gpe +require ${PN}.inc -DESCRIPTION = "GPE infrared communication applet" -DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib" RDEPENDS = "libopenobex-1.0-1 irda-utils" -SECTION = "gpe" -PRIORITY = "optional" -LICENSE = "GPL" +PR = "r1" SRC_URI += "file://vcard-send.patch;patch=1;pnum=0" + +inherit gpe diff --git a/packages/gpe-beam/gpe-beam_0.2.7.bb b/packages/gpe-beam/gpe-beam_0.2.7.bb index 51b99fcfc6..f19b64d933 100644 --- a/packages/gpe-beam/gpe-beam_0.2.7.bb +++ b/packages/gpe-beam/gpe-beam_0.2.7.bb @@ -1,12 +1,8 @@ -PR = "r1" - -inherit gpe +require ${PN}.inc -DESCRIPTION = "GPE infrared communication applet" -DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib" RDEPENDS = "libopenobex-1.0-1 irda-utils" -SECTION = "gpe" -PRIORITY = "optional" -LICENSE = "GPL" +PR = "r1" SRC_URI += "file://decl.patch;patch=1;pnum=0" + +inherit gpe diff --git a/packages/gpe-beam/gpe-beam_0.2.8.bb b/packages/gpe-beam/gpe-beam_0.2.8.bb index f68b50341a..9795827aa8 100644 --- a/packages/gpe-beam/gpe-beam_0.2.8.bb +++ b/packages/gpe-beam/gpe-beam_0.2.8.bb @@ -1,12 +1,7 @@ -PR = "r0" +require ${PN}.inc -inherit gpe - -DESCRIPTION = "GPE infrared communication applet" -DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib" RDEPENDS = "irda-utils" -SECTION = "gpe" -PRIORITY = "optional" -LICENSE = "GPL" SRC_URI += "file://dbus-new-api.patch;patch=1" + +inherit gpe diff --git a/packages/gpe-beam/gpe-beam_0.2.9.bb b/packages/gpe-beam/gpe-beam_0.2.9.bb index 8275cf6c3a..b96bed4a2f 100644 --- a/packages/gpe-beam/gpe-beam_0.2.9.bb +++ b/packages/gpe-beam/gpe-beam_0.2.9.bb @@ -1,9 +1,6 @@ -DESCRIPTION = "GPE infrared communication applet" -DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib" +require ${PN}.inc + RDEPENDS = "irda-utils" -SECTION = "gpe" -PRIORITY = "optional" -LICENSE = "GPL" inherit gpe diff --git a/packages/initscripts/initscripts-1.0/populate-volatile.sh b/packages/initscripts/initscripts-1.0/populate-volatile.sh index a60cc0d420..c5692fea7f 100755 --- a/packages/initscripts/initscripts-1.0/populate-volatile.sh +++ b/packages/initscripts/initscripts-1.0/populate-volatile.sh @@ -11,7 +11,7 @@ COREDEF="00_core" create_file() { EXEC=" touch \"$1\"; - chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1 + chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1; chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 " test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache @@ -26,7 +26,7 @@ create_file() { mk_dir() { EXEC=" mkdir -p \"$1\"; - chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1 + chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1; chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 " test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache diff --git a/packages/parted/parted_1.8.2.bb b/packages/parted/parted_1.8.2.bb new file mode 100644 index 0000000000..1185014aa3 --- /dev/null +++ b/packages/parted/parted_1.8.2.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "parted, the GNU partition resizing program" +HOMEPAGE = "http://www.gnu.org/software/parted/parted.html" +LICENSE = "GPLv2" +SECTION = "console/tools" +DEPENDS = "readline e2fsprogs-libs" +PR = "r0" + +SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz" + +#EXTRA_OECONF = "--disable-Werror" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/portmap/portmap-unslung_5-9.bb b/packages/portmap/portmap-unslung_5-9.bb index ee6c648e9b..c86ae1e892 100644 --- a/packages/portmap/portmap-unslung_5-9.bb +++ b/packages/portmap/portmap-unslung_5-9.bb @@ -4,8 +4,8 @@ LICENSE = "GPL" PR = "r2" COMPATIBLE_MACHINE = "nslu2" -SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \ - http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \ +SRC_URI = "${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \ + ${DEBIAN_MIRROR}/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \ file://no-libwrap.patch;patch=1;pnum=0 \ file://portmap.init \ file://make.patch;patch=1" @@ -18,6 +18,5 @@ do_compile() { } do_install() { - oe_runmake 'docdir=${datadir}/doc/portmap' \ - 'DESTDIR=${D}' install + oe_runmake 'docdir=${datadir}/doc/portmap' 'DESTDIR=${D}' install } diff --git a/packages/portmap/portmap.inc b/packages/portmap/portmap.inc index ad477828fb..e7e7673001 100644 --- a/packages/portmap/portmap.inc +++ b/packages/portmap/portmap.inc @@ -2,17 +2,13 @@ DESCRIPTION = "RPC program number mapper." SECTION = "console/network" LICENSE = "GPL" -SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \ - http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \ +SRC_URI = "${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \ + http://${DEBIAN_MIRROR}/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \ file://no-libwrap.patch;patch=1;pnum=0 \ file://portmap.init \ file://make.patch;patch=1" S = "${WORKDIR}/portmap_5beta" -PACKAGES =+ "portmap-utils" -FILES_portmap-utils = "/sbin/pmap_set /sbin/pmap_dump" -FILES_${PN}-doc += "${docdir}" - INITSCRIPT_NAME = "portmap" INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ." @@ -27,6 +23,9 @@ do_compile() { do_install() { install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap - oe_runmake 'docdir=${docdir}/portmap' \ - 'DESTDIR=${D}' install + oe_runmake 'docdir=${docdir}/portmap' 'DESTDIR=${D}' install } + +PACKAGES =+ "portmap-utils" +FILES_portmap-utils = "/sbin/pmap_set /sbin/pmap_dump" +FILES_${PN}-doc += "${docdir}" diff --git a/packages/povray/povray_3.6.1.bb b/packages/povray/povray_3.6.1.bb index 914d2eaad6..e1c60570be 100644 --- a/packages/povray/povray_3.6.1.bb +++ b/packages/povray/povray_3.6.1.bb @@ -19,7 +19,7 @@ PARALLEL_MAKE = "" #autoreconf breaks, so we'll skip that. The added advantage is that the patch to ./configure actually has effect do_configure() { - oe_runconf + oe_runconf COMPILED_BY="${MAINTAINER}" } PACKAGES += "${PN}-scenes ${PN}-ini ${PN}-icons ${PN}-scripts ${PN}-includes" diff --git a/packages/qiv/qiv_1.9.bb b/packages/qiv/qiv_1.9.bb index c3aeb05bd2..17138452a5 100644 --- a/packages/qiv/qiv_1.9.bb +++ b/packages/qiv/qiv_1.9.bb @@ -12,6 +12,9 @@ inherit pkgconfig binconfig CFLAGS += " -lSM -lICE -lXdmcp" do_install() { - install -s -m 0755 qiv ${D}${bindir}/qiv + install -d ${D}${bindir} + install -d ${D}${mandir}/man1/ + + install -s -m 0755 qiv ${D}${bindir}/qiv install -m 0644 qiv.1 ${D}${mandir}/man1/qiv.1 } diff --git a/packages/ruby/ruby-1.8.5/.mtn2git_empty b/packages/ruby/ruby-1.8.5/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/ruby/ruby-1.8.5/.mtn2git_empty diff --git a/packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch b/packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch new file mode 100644 index 0000000000..82137896b9 --- /dev/null +++ b/packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch @@ -0,0 +1,16 @@ +--- packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch f667776fd8760b7048cc9617930112347b0ef2c0 ++++ packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch f667776fd8760b7048cc9617930112347b0ef2c0 +@@ -0,0 +1,13 @@ ++--- ruby-1.8.5/ext/socket/extconf.rb.orig 2006-12-30 15:12:31.000000000 +1100 +++++ ruby-1.8.5/ext/socket/extconf.rb 2006-12-30 15:16:24.000000000 +1100 ++@@ -216,6 +216,10 @@ ++ } ++ EOF ++ end +++# Ignore the actual result of the above test and assume that +++# everything is OK. +++getaddr_info_ok = true +++ ++ if ipv6 and not getaddr_info_ok ++ abort <<EOS ++ diff --git a/packages/ruby/ruby-1.8.5/extmk_run.patch b/packages/ruby/ruby-1.8.5/extmk_run.patch new file mode 100644 index 0000000000..57926f51b0 --- /dev/null +++ b/packages/ruby/ruby-1.8.5/extmk_run.patch @@ -0,0 +1,15 @@ +============================================================ +--- packages/ruby/ruby-1.8.5/extmk_run.patch d9738b5a71e2f9a98d009af9fd0ef1ceaff9ef48 ++++ packages/ruby/ruby-1.8.5/extmk_run.patch d9738b5a71e2f9a98d009af9fd0ef1ceaff9ef48 +@@ -0,0 +1,11 @@ ++--- ruby-1.8.5/common.mk.orig 2006-12-30 13:07:32.000000000 +1100 +++++ ruby-1.8.5/common.mk 2006-12-30 13:08:32.000000000 +1100 ++@@ -56,7 +56,7 @@ ++ --make="$(MAKE)" \ ++ --mflags="$(MFLAGS)" \ ++ --make-flags="$(MAKEFLAGS)" ++-EXTMK_ARGS = $(SCRIPT_ARGS) --extout="$(EXTOUT)" --extension $(EXTS) --extstatic $(EXTSTATIC) -- +++EXTMK_ARGS = $(SCRIPT_ARGS) --with-ldflags="%%TARGET_LDFLAGS%%" --with-cflags="%%TARGET_CFLAGS%%" --extout="$(EXTOUT)" --extension $(EXTS) --extstatic $(EXTSTATIC) -- ++ ++ all: $(MKFILES) $(PREP) $(RBCONFIG) $(LIBRUBY) ++ @$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS) diff --git a/packages/ttf-fonts/ttf-sazanami_20040629.bb b/packages/ttf-fonts/ttf-sazanami_20040629.bb index d1c4882d14..a51036155d 100644 --- a/packages/ttf-fonts/ttf-sazanami_20040629.bb +++ b/packages/ttf-fonts/ttf-sazanami_20040629.bb @@ -1,16 +1,18 @@ +require ttf.inc + DESCRIPTION = "Sazanami Gothic/Mincho Japanese TrueType fonts" DESCRIPTION_ttf-sazanami-gothic = "Sazanami Gothic Japanese TrueType font" DESCRIPTION_ttf-sazanami-mincho = "Sazanami Mincho Japanese TrueType font" -LICENSE = "${PN}" -SRC_DISTRIBUTE_LICENSES += "${PN}" AUTHOR = "Electronic Font Open Laboratory (/efont/)" HOMEPAGE = "http://sourceforge.jp/projects/efont/" +LICENSE = "${PN}" +SRC_DISTRIBUTE_LICENSES += "${PN}" +RPROVIDES = "virtual/japanese-font" +PR = "r1" SRC_URI = "http://download.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2" S = "${WORKDIR}/sazanami-20040629" -require ttf.inc - PACKAGES = "ttf-sazanami-gothic ttf-sazanami-mincho" FILES_ttf-sazanami-gothic = "${datadir}/fonts/truetype/sazanami-gothic.ttf \ ${datadir}/doc/ttf-sazanami-gothic/README" diff --git a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb index 7ed04075c8..463312d017 100644 --- a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb @@ -17,7 +17,7 @@ FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" do_compile() { ( unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS - cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} makekeys.c -o makekeys + cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys ) || exit 1 rm -f ${STAGING_INCDIR}/X11/Xlib.h oe_runmake |