diff options
24 files changed, 252 insertions, 320 deletions
diff --git a/packages/cron/cron_3.0pl1.bb b/packages/cron/cron_3.0pl1.bb index cb4d4f18f2..36bfe5d89d 100644 --- a/packages/cron/cron_3.0pl1.bb +++ b/packages/cron/cron_3.0pl1.bb @@ -1,7 +1,7 @@ SECTION = "base" DESCRIPTION = "Vixie cron." LICENSE = "cron" -PR="r6" +PR="r7" DEPENDS += "install-native" SRC_URI = "http://ibiblio.org/pub/Linux/system/daemons/cron/cron${PV}.tar.gz \ @@ -12,7 +12,7 @@ S = "${WORKDIR}/cron${PV}" INITSCRIPT_NAME = "cron" INITSCRIPT_PARAMS = "defaults" - +inherit update-rc.d CFLAGS_append = " -I${S} -DSYS_TIME_H=0" do_install () { diff --git a/packages/dropbear/dropbear_0.46.bb b/packages/dropbear/dropbear_0.46.bb index 3a2b54072f..739950ed1a 100644 --- a/packages/dropbear/dropbear_0.46.bb +++ b/packages/dropbear/dropbear_0.46.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html" SECTION = "console/network" LICENSE = "MIT" DEPENDS = "zlib" -PR = "r1" +PR = "r2" PROVIDES = "ssh sshd" SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ @@ -41,10 +41,12 @@ do_install() { ${D}${localstatedir} install -m 0755 dropbearmulti ${D}${sbindir}/ - for i in ${BINCOMMANDS} - do - ln -s ${sbindir}/dropbearmulti ${D}${bindir}/$i - done +# for i in ${BINCOMMANDS} +# do +# ln -s ${sbindir}/dropbearmulti ${D}${bindir}/$i +# done + ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient + for i in ${SBINCOMMANDS} do ln -s ./dropbearmulti ${D}${sbindir}/$i @@ -57,6 +59,11 @@ do_install() { chmod 755 ${D}${sysconfdir}/init.d/dropbear } +pkg_postinst () { + update-alternatives --install ${bindir}/scp scp ${sbindir}/dropbearmulti 20 + update-alternatives --install ${bindir}/ssh ssh ${sbindir}/dropbearmulti 20 +} + pkg_postrm_append () { if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then rm ${sysconfdir}/dropbear/dropbear_rsa_host_key diff --git a/packages/libxfce4mcs/libxfce4mcs_4.2.0.bb b/packages/libxfce4mcs/libxfce4mcs_4.2.0.bb deleted file mode 100644 index ff4dae1c8e..0000000000 --- a/packages/libxfce4mcs/libxfce4mcs_4.2.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -SECTION = "x11/libs" -# libxfce4mcs OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="Settings management library used by most XFce 4 modules" -DEPENDS="libxfce4util" - -inherit xfce pkgconfig - -do_stage() { - install -d ${STAGING_INCDIR}/xfce4/libxfce4mcs - - install -m 644 libxfce4mcs/mcs-common.h ${STAGING_INCDIR}/xfce4/libxfce4mcs - install -m 644 libxfce4mcs/mcs-client.h ${STAGING_INCDIR}/xfce4/libxfce4mcs - install -m 644 libxfce4mcs/mcs-manager.h ${STAGING_INCDIR}/xfce4/libxfce4mcs - oe_libinstall -C libxfce4mcs -so libxfce4mcs-manager ${STAGING_LIBDIR} - oe_libinstall -C libxfce4mcs -so libxfce4mcs-client ${STAGING_LIBDIR} -} diff --git a/packages/libxfce4util/libxfce4util.inc b/packages/libxfce4util/libxfce4util.inc index fcd5b74ad8..dbe6501e42 100644 --- a/packages/libxfce4util/libxfce4util.inc +++ b/packages/libxfce4util/libxfce4util.inc @@ -7,16 +7,6 @@ SECTION = "x11/libs" LICENSE = "GPL" DEPENDS = "glib-2.0" -# | checking whether putenv() implementation is broken... configure: error: cannot run test program while cross compiling -BROKEN = "1" - -# Fixed on i386/i486/i586/i686 - needs to be confirmed on other platforms - -BROKEN_i386="0" -BROKEN_i486="0" -BROKEN_i586="0" -BROKEN_i686="0" - inherit xfce pkgconfig XFCE_HEADERS="debug.h utf8.h xfce-generics.h xfce-resource.h \ @@ -24,11 +14,18 @@ XFCE_HEADERS="debug.h utf8.h xfce-generics.h xfce-resource.h \ xfce-desktopentry.h xfce-miscutils.h libxfce4util.h \ xfce-fileutils.h xfce-rc.h" +MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4" + do_stage() { - install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/xfce4/libxfce4util + install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/libxfce4util for file in ${XFCE_HEADERS}; do - install -m 644 libxfce4util/$file ${STAGING_INCDIR}/xfce4/libxfce4util + install -m 644 libxfce4util/$file ${STAGING_INCDIR}/libxfce4util done oe_libinstall -C libxfce4util -so libxfce4util ${STAGING_LIBDIR} + + install -d ${STAGING_DATADIR}/aclocal/ + install -m 0644 ${MACROS} ${STAGING_DATADIR}/aclocal/ } + +FILES_${PN}-dev += " ${datadir}/xfce4/m4" diff --git a/packages/libxfce4util/libxfce4util_4.2.0.bb b/packages/libxfce4util/libxfce4util_4.2.0.bb deleted file mode 100644 index fcd5b74ad8..0000000000 --- a/packages/libxfce4util/libxfce4util_4.2.0.bb +++ /dev/null @@ -1,34 +0,0 @@ -# libxfce4util OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION = "Basic utility library for Xfce4" -SECTION = "x11/libs" -LICENSE = "GPL" -DEPENDS = "glib-2.0" - -# | checking whether putenv() implementation is broken... configure: error: cannot run test program while cross compiling -BROKEN = "1" - -# Fixed on i386/i486/i586/i686 - needs to be confirmed on other platforms - -BROKEN_i386="0" -BROKEN_i486="0" -BROKEN_i586="0" -BROKEN_i686="0" - -inherit xfce pkgconfig - -XFCE_HEADERS="debug.h utf8.h xfce-generics.h xfce-resource.h \ - i18n.h util.h xfce-kiosk.h libxfce4util-config.h \ - xfce-desktopentry.h xfce-miscutils.h libxfce4util.h \ - xfce-fileutils.h xfce-rc.h" - -do_stage() { - install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/xfce4/libxfce4util - for file in ${XFCE_HEADERS}; do - install -m 644 libxfce4util/$file ${STAGING_INCDIR}/xfce4/libxfce4util - done - - oe_libinstall -C libxfce4util -so libxfce4util ${STAGING_LIBDIR} -} diff --git a/packages/libxfce4util/libxfce4util_4.2.2.bb b/packages/libxfce4util/libxfce4util_4.2.2.bb index 0fbc5321bb..e89d2cfa97 100644 --- a/packages/libxfce4util/libxfce4util_4.2.2.bb +++ b/packages/libxfce4util/libxfce4util_4.2.2.bb @@ -3,11 +3,5 @@ # Released under the MIT license (see packages/COPYING) include ${PN}.inc +PR = "r1" -MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4" -FILES_${PN}-dev += " ${datadir}/xfce4/m4" - -do_stage() { - install -d ${STAGING_DATADIR}/aclocal/ - install -m 0644 ${MACROS} ${STAGING_DATADIR}/aclocal/ -} diff --git a/packages/libxfcegui4/libxfcegui4.inc b/packages/libxfcegui4/libxfcegui4.inc index 36a125b747..882cf3a55b 100644 --- a/packages/libxfcegui4/libxfcegui4.inc +++ b/packages/libxfcegui4/libxfcegui4.inc @@ -2,15 +2,12 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -DESCRIPTION="XFCE Widget library and X Window System interaction" -DEPENDS="libxfce4util dbh libxml2 gtk+" +DESCRIPTION = "XFCE Widget library and X Window System interaction" +DEPENDS = "libxfce4util dbh libxml2 gtk+" SECTION = "x11/libs" inherit xfce pkgconfig -FILES_${PN} += "/usr/lib/xfce4/modules/* /usr/share/xfce4/mime/ \ - /usr/share/icons/hicolor/" - XFCE_HEADERS= "dialogs.h netk-trayicon.h xfce-icontheme.h \ gtk_style.h netk-util.h xfce_aboutdialog.h \ gtktoxevent.h netk-window-action-menu.h xfce_clock.h \ @@ -29,17 +26,17 @@ XFCE_HEADERS= "dialogs.h netk-trayicon.h xfce-icontheme.h \ MODULE_HEADERS="combo.h constants.h mime.h mime_icons.h" do_stage() { - install -d ${STAGING_INCDIR}/xfce4/libxfcegui4 - install -d ${STAGING_INCDIR}/xfce4/xfce4-modules - install -d ${STAGING_LIBDIR}/xfce4/modules + install -d ${STAGING_INCDIR}/libxfcegui4 + install -d ${STAGING_INCDIR}/xfce4-modules + install -d ${STAGING_LIBDIR}/modules for file in ${XFCE_HEADERS}; do - install -m 644 libxfcegui4/$file ${STAGING_INCDIR}/xfce4/libxfcegui4 + install -m 644 libxfcegui4/$file ${STAGING_INCDIR}/libxfcegui4 done for file in ${MODULE_HEADERS}; do install -m 644 xfce4-modules/headers/$file \ - ${STAGING_INCDIR}/xfce4/xfce4-modules + ${STAGING_INCDIR}/xfce4-modules done oe_libinstall -C libxfcegui4 -so libxfcegui4 ${STAGING_LIBDIR} @@ -51,3 +48,5 @@ do_stage() { oe_libinstall -C xfce4-modules/mime-applications -so libxfce4_mime \ ${STAGING_LIBDIR}/xfce4/modules } + +FILES_${PN} += "${libdir}/xfce4/modules ${datadir}/xfce4/mime ${datadir}/icons/hicolor" diff --git a/packages/libxfcegui4/libxfcegui4_4.2.0.bb b/packages/libxfcegui4/libxfcegui4_4.2.0.bb deleted file mode 100644 index 4eb5d8a781..0000000000 --- a/packages/libxfcegui4/libxfcegui4_4.2.0.bb +++ /dev/null @@ -1,53 +0,0 @@ -SECTION = "x11/libs" -# libxfcegui4 OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="XFCE Widget library and X Window System interaction" -DEPENDS="libxfce4util dbh libxml2 gtk+" - -inherit xfce pkgconfig - -FILES_${PN} += "/usr/lib/xfce4/modules/* /usr/share/xfce4/mime/ \ - /usr/share/icons/hicolor/" - -XFCE_HEADERS= "dialogs.h netk-trayicon.h xfce-icontheme.h \ - gtk_style.h netk-util.h xfce_aboutdialog.h \ - gtktoxevent.h netk-window-action-menu.h xfce_clock.h \ - icons.h netk-window-menu.h xfce_decorbutton.h \ - libnetk.h netk-window.h xfce_decortoggle.h \ - libxfcegui4-config.h netk-workspace.h xfce_framebox.h \ - libxfcegui4.h preview_filesel.h xfce_iconbutton.h \ - netk-application.h session-client.h xfce_marshal.h \ - netk-class-group.h xfce-appmenuitem.h xfce_menubutton.h \ - netk-enum-types.h xfce-colorbutton.h xfce_movehandler.h \ - netk-marshal.h xfce-exec.h xfce_scaled_image.h \ - netk-pager.h xfce-filechooser.h xfce_systemtray.h \ - netk-screen.h xfce-gdk-extensions.h xfce_togglebutton.h \ - netk-tasklist.h xfce-gtk-extensions.h xinerama.h" - -MODULE_HEADERS="combo.h constants.h mime.h mime_icons.h" - -do_stage() { - install -d ${STAGING_INCDIR}/xfce4/libxfcegui4 - install -d ${STAGING_INCDIR}/xfce4/xfce4-modules - install -d ${STAGING_LIBDIR}/xfce4/modules - - for file in ${XFCE_HEADERS}; do - install -m 644 libxfcegui4/$file ${STAGING_INCDIR}/xfce4/libxfcegui4 - done - - for file in ${MODULE_HEADERS}; do - install -m 644 xfce4-modules/headers/$file \ - ${STAGING_INCDIR}/xfce4/xfce4-modules - done - - oe_libinstall -C libxfcegui4 -so libxfcegui4 ${STAGING_LIBDIR} - - oe_libinstall -C xfce4-modules/mime-icons -so libxfce4_mime_icons \ - ${STAGING_LIBDIR}/xfce4/modules - oe_libinstall -C xfce4-modules/combo -so libxfce4_combo \ - ${STAGING_LIBDIR}/xfce4/modules - oe_libinstall -C xfce4-modules/mime-applications -so libxfce4_mime \ - ${STAGING_LIBDIR}/xfce4/modules -} diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 7e248bc60e..1e53d342d2 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -34,24 +34,20 @@ OPENSLUG_DEVELOPMENT = "\ openssh \ patch \ pciutils \ + perl \ pkgconfig \ quilt \ sed \ strace \ - util-linux \ - " - -# These packages only build on TARGET_OS=linux, not -# TARGET_OS=linux-uclibc -OPENSLUG_DEVELOPMENT_append_linux = "\ - perl \ tar \ + util-linux \ " OPENSLUG_PACKAGES = "\ atftp \ bash \ + bind \ bluez-utils-nodbus \ bridge-utils \ bwmon \ @@ -60,6 +56,7 @@ OPENSLUG_PACKAGES = "\ cron \ cvs\ cyrus-imapd \ + db4 \ dnsmasq \ expat \ ftpd-topfield \ @@ -67,61 +64,52 @@ OPENSLUG_PACKAGES = "\ gphoto2 \ gtk-doc \ less \ + libpam \ libusb \ libxml2 \ + man man-pages \ + mgetty \ miau \ microcom \ + mpd \ mt-daapd \ mutt \ mysql \ nail \ nano \ ncftp \ + nfs-utils \ + ntp \ obexftp openobex openobex-apps ircp \ + openldap \ + openntpd \ openssh \ openvpn \ pcre \ + php \ + postfix \ ppp \ procps \ + psmisc \ puppy \ pwc \ + python \ + reiserfsprogs reiser4progs \ rsync \ + samba \ + sane-backends \ + screen \ setpwc \ + strace \ + streamripper \ sudo \ sysfsutils \ thttpd \ - db4 \ - openldap \ - openntpd \ - ntp \ - reiserfsprogs reiser4progs \ - python \ - samba \ - sane-backends \ - strace \ thttpd \ + timezones \ + unionfs-modules unionfs-utils \ vlan \ wget \ - unionfs-modules unionfs-utils \ - " - -# These packages only build on TARGET_OS=linux, not -# TARGET_OS=linux-uclibc (Note that for several this -# is because of use of single precision FP interfaces -# such as sinf.) -OPENSLUG_PACKAGES_append_linux = "\ - bind \ - man man-pages \ - mgetty \ - mpd \ - nfs-utils \ - libpam \ - php \ - postfix \ - psmisc \ - screen \ - streamripper \ - timezones \ xinetd \ yp-tools ypbind ypserv \ " diff --git a/packages/meta/ucslugc-packages.bb b/packages/meta/ucslugc-packages.bb new file mode 100644 index 0000000000..afd029bc30 --- /dev/null +++ b/packages/meta/ucslugc-packages.bb @@ -0,0 +1,131 @@ +# Meta package containing all the packages which build for UcSlugC +# +# All packages in here must build with the ucslugc.conf distro, they +# do not necessarily work. +DESCRIPTION = "Packages that are compatible with the UcSlugC firmware" +LICENSE = MIT +PR = "r0" + +INHIBIT_DEFAULT_DEPS = "1" +ALLOW_EMPTY = 1 +PACKAGES = "${PN}" + +# The list of packages to build for the ucslugc DISTRO. +# KEEP IN ALPHABETICAL ORDER +UCSLUGC_PACKAGES = "\ + atftp \ + autoconf \ + automake \ + bash \ + bash \ + binutils \ + bison \ + bluez-utils-nodbus \ + bridge-utils \ + bwmon \ + bzip2 \ + ccxstream \ + coreutils \ + coreutils \ + cron \ + cvs \ + cvs\ + cyrus-imapd \ + db4 \ + diffutils \ + dnsmasq \ + expat \ + findutils \ + flex \ + ftpd-topfield \ + gawk \ + gcc \ + gdb \ + glib-2.0 \ + gnu-config \ + gphoto2 \ + grep \ + gtk-doc \ + gzip \ + ipkg-utils \ + less \ + libtool \ + libusb \ + libxml2 \ + lsof \ + m4 \ + make \ + miau \ + microcom \ + monotone-4 monotone-5 \ + mt-daapd \ + mutt \ + mysql \ + nail \ + nano \ + ncftp \ + ncurses \ + ntp \ + obexftp openobex openobex-apps ircp \ + openldap \ + openntpd \ + openssh \ + openssh \ + openvpn \ + patch \ + pciutils \ + pcre \ + pkgconfig \ + ppp \ + procps \ + puppy \ + pwc \ + python \ + quilt \ + reiserfsprogs reiser4progs \ + rsync \ + samba \ + sane-backends \ + sed \ + setpwc \ + strace \ + strace \ + sudo \ + sysfsutils \ + thttpd \ + thttpd \ + unionfs-modules unionfs-utils \ + util-linux \ + vlan \ + wget \ + " + +# These packages only build on TARGET_OS=linux, but not TARGET_OS=linux-uclibc. +# KEEP IN ALPHABETICAL ORDER +UCSLUGC_BROKEN_PACKAGES = "\ + bind \ + libpam \ + man man-pages \ + mgetty \ + mpd \ + perl \ + php \ + postfix \ + psmisc \ + screen \ + streamripper \ + tar \ + timezones \ + xinetd \ + " + +# These packages will never build because uclibc lacks (and always will lack) +# appropriate support. This define is for documentation of this fact! +UCSLUGC_UNSUPPORTABLE_PACKAGES = "\ + nfs-utils \ + yp-tools ypbind ypserv \ + " + +# The package-index at the end causes regeneration of the Packages.gz and +# other control files. +DEPENDS = "openslug-image ${UCSLUGC_PACKAGES} package-index" diff --git a/packages/openntpd/openntpd_3.7p1.bb b/packages/openntpd/openntpd_3.7p1.bb index bb2997eb0b..3ca809f002 100644 --- a/packages/openntpd/openntpd_3.7p1.bb +++ b/packages/openntpd/openntpd_3.7p1.bb @@ -6,7 +6,7 @@ LICENSE = "BSD" SECTION = "console/network" MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>" DEPENDS = "timezones" -PR="r6" +PR="r7" SRC_URI = "http://www.zip.com.au/~dtucker/openntpd/release/openntpd-${PV}.tar.gz \ file://autofoo.patch;patch=1 \ @@ -19,7 +19,7 @@ INITSCRIPT_NAME = "openntpd" INITSCRIPT_PARAMS = "defaults" -inherit autotools +inherit autotools update-rc.d EXTRA_OECONF += "CFLAGS=-DUSE_ADJTIMEX --disable-strip --prefix=/usr \ --sysconfdir=/etc --with-privsep-path=/var/shared/empty \ diff --git a/packages/openssh/openssh_4.0p1.bb b/packages/openssh/openssh_4.0p1.bb index e3f78c2de5..47225eb532 100644 --- a/packages/openssh/openssh_4.0p1.bb +++ b/packages/openssh/openssh_4.0p1.bb @@ -11,7 +11,7 @@ used to provide applications with a secure communication channel." HOMEPAGE = "http://www.openssh.org/" LICENSE = "BSD" MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" -PR = "r1" +PR = "r4" SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \ file://configure.patch;patch=1 \ @@ -46,11 +46,13 @@ do_compile_append () { do_install_append() { install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd + mv ${D}${bindir}/scp ${D}${bindir}/scp.openssh + mv ${D}${bindir}/ssh ${D}${bindir}/ssh.openssh } PACKAGES =+ " openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc" -FILES_openssh-scp = "${bindir}/scp" -FILES_openssh-ssh = "${bindir}/ssh ${bindir}/slogin /${sysconfdir}/ssh/ssh_config" +FILES_openssh-scp = "${bindir}/scp.${PN}" +FILES_openssh-ssh = "${bindir}/ssh.${PN} ${bindir}/slogin /${sysconfdir}/ssh/ssh_config" FILES_openssh-sshd = "${sbindir}/sshd /${sysconfdir}/init.d/sshd ${bindir}/ssh-keygen" FILES_openssh-sshd += " /${sysconfdir}/ssh/moduli /${sysconfdir}/ssh/sshd_config /var/run/sshd" FILES_openssh-sftp = "${bindir}/sftp ${libdir}exec/sftp-server" @@ -65,10 +67,18 @@ if test "x$D" != "x"; then else addgroup sshd adduser --system --home /var/run/sshd --no-create-home --disabled-password --ingroup sshd -s /bin/false sshd - update-rc.d sshd defaults + update-rc.d sshd defaults 9 fi } +pkg_postinst_openssh-scp() { + update-alternatives --install ${bindir}/scp scp scp.${PN} 90 +} + +pkg_postinst_openssh-ssh() { + update-alternatives --install ${bindir}/ssh ssh ssh.${PN} 90 +} + pkg_postrm_openssh-sshd() { if test "x$D" != "x"; then exit 1 diff --git a/packages/procps/procps-3.2.5/install.patch b/packages/procps/procps-3.2.5/install.patch index a05eec4ab6..9f1ef6915d 100644 --- a/packages/procps/procps-3.2.5/install.patch +++ b/packages/procps/procps-3.2.5/install.patch @@ -1,25 +1,27 @@ -*** procps-3.2.5/Makefile.orig Sun Jul 24 03:29:32 2005 ---- procps-3.2.5/Makefile Sun Jul 24 03:30:14 2005 -*************** -*** 211,220 **** - ###### install - - $(BINFILES) : all -! $(install) --mode a=rx $(notdir $@) $@ - - $(MANFILES) : all -! $(install) --mode a=r $(notdir $@) $@ - - install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL)) - cd $(usr/bin) && $(ln_f) skill snice ---- 211,220 ---- - ###### install - - $(BINFILES) : all -! $(install) -m 555 $(notdir $@) $@ - - $(MANFILES) : all -! $(install) -m 444 $(notdir $@) $@ - - install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL)) - cd $(usr/bin) && $(ln_f) skill snice +--- procps-3.2.5.virgin/Makefile 2005-01-26 05:55:26.000000000 +0100 ++++ procps-3.2.5/Makefile 2005-08-03 04:55:26.346984488 +0200 +@@ -30,7 +30,10 @@ + install := install -D --owner 0 --group 0 + + # Lame x86-64 /lib64 and /usr/lib64 abomination: +-lib64 := lib$(shell [ -d /lib64 ] && echo 64) ++# lib64 := lib$(shell [ -d /lib64 ] && echo 64) ++ ++# Equally lame hack to work around makefile lameness when the host arch is 64bit, but the target is not. ++lib64 := lib + + usr/bin := $(DESTDIR)/usr/bin/ + bin := $(DESTDIR)/bin/ +@@ -211,10 +214,10 @@ + ###### install + + $(BINFILES) : all +- $(install) --mode a=rx $(notdir $@) $@ ++ $(install) -m 555 $(notdir $@) $@ + + $(MANFILES) : all +- $(install) --mode a=r $(notdir $@) $@ ++ $(install) -m 444 $(notdir $@) $@ + + install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL)) + cd $(usr/bin) && $(ln_f) skill snice diff --git a/packages/procps/procps_3.2.5.bb b/packages/procps/procps_3.2.5.bb index 51e37a106b..21b2783e55 100644 --- a/packages/procps/procps_3.2.5.bb +++ b/packages/procps/procps_3.2.5.bb @@ -7,7 +7,7 @@ SECTION = "base" PRIORITY = "optional" MAINTAINER = "Inge Arnesen <inge.arnesen@gmail.com>" DEPENDS = "ncurses" -PR = "r1" +PR = "r2" SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \ file://install.patch;patch=1 \ diff --git a/packages/samba/samba_3.0.14a.bb b/packages/samba/samba_3.0.14a.bb index dbc85efb44..3c660ed5c1 100644 --- a/packages/samba/samba_3.0.14a.bb +++ b/packages/samba/samba_3.0.14a.bb @@ -1,4 +1,4 @@ -PR = "r10" +PR = "r11" SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ file://configure.patch;patch=1 \ @@ -10,6 +10,7 @@ SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ S := ${WORKDIR}/${P}/source include samba.inc +inherit update-rc.d INITSCRIPT_NAME = "samba" # No dependencies, goes in at level 20 (NOTE: take care with the diff --git a/packages/thttpd/thttpd_2.25b.bb b/packages/thttpd/thttpd_2.25b.bb index b53e1b3127..bbb02199a7 100644 --- a/packages/thttpd/thttpd_2.25b.bb +++ b/packages/thttpd/thttpd_2.25b.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A simple, small, portable, fast, and secure HTTP server." LICENSE = "BSD" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" HOMEPAGE = "http://www.acme.com/software/thttpd/" -PR="r4" +PR="r5" SRC_URI = "http://www.acme.com/software/thttpd/thttpd-2.25b.tar.gz \ file://install.patch;patch=1 \ @@ -13,7 +13,7 @@ S = "${WORKDIR}/thttpd-${PV}" INITSCRIPT_NAME = "thttpd" INITSCRIPT_PARAMS = "defaults" -inherit autotools +inherit autotools update-rc.d EXTRA_OEMAKE += "'WEBDIR=${servicedir}/www'" FILES_${PN}_append = " ${servicedir}" diff --git a/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.0.bb b/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.0.bb deleted file mode 100644 index 521d47697e..0000000000 --- a/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -# xfce-mcs-manager OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="XFCE4 Settings manager." - -DEPENDS="libxfcegui4 libxfce4mcs" - -inherit xfce - -do_stage() { - install -d ${STAGING_INCDIR}/xfce4 - install -d ${STAGING_INCDIR}/xfce4/xfce-mcs-manager - install -m 644 xfce-mcs-manager/manager-plugin.h ${STAGING_INCDIR}/xfce4/xfce-mcs-manager -} - -# xfce-mcs-manager.pc uses ${libdir} to indicate where the mcs plugins live -# the standard pkgconfig mangling was confusing us. Mangling is not required -# for this particular .pc, so the following will suffice: - -do_stage_append () { - install -d ${PKG_CONFIG_PATH} - install -m 0644 ${S}/xfce-mcs-manager/xfce-mcs-manager.pc ${PKG_CONFIG_PATH}/xfce-mcs-manager.pc -} diff --git a/packages/xfce-mcs-plugins/xfce-mcs-plugins.inc b/packages/xfce-mcs-plugins/xfce-mcs-plugins.inc index 14dfe175ea..b5b4505e98 100644 --- a/packages/xfce-mcs-plugins/xfce-mcs-plugins.inc +++ b/packages/xfce-mcs-plugins/xfce-mcs-plugins.inc @@ -2,8 +2,11 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -DESCRIPTION="Common XFCE4 configuration plugins." -DEPENDS="libxfcegui4 xfce-mcs-manager gtk+" -SECTION="x11" +DESCRIPTION = "Common XFCE4 configuration plugins." +DEPENDS = "libxfcegui4 xfce-mcs-manager gtk+" +SECTION = "x11" inherit xfce + +PACKAGES += "${PN}-mcs-plugins" +FILES_${PN}-mcs-plugins = "${libdir}/xfce4/mcs-plugins/*.so" diff --git a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.0.bb b/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.0.bb deleted file mode 100644 index 92046c0b81..0000000000 --- a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -# xfce-mcs-plugins OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="Common XFCE4 configuration plugins." -DEPENDS="libxfcegui4 xfce-mcs-manager gtk+" -inherit xfce diff --git a/packages/xfce-utils/xfce-utils_4.2.0.bb b/packages/xfce-utils/xfce-utils_4.2.0.bb deleted file mode 100644 index 8498cbf088..0000000000 --- a/packages/xfce-utils/xfce-utils_4.2.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -# xfce-mcs-plugins OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -PR="r1" - -DESCRIPTION="XFCE4 Utilities" -DEPENDS="x11 libxfcegui4 xfce-mcs-manager" -inherit xfce - -FILES_${PN} += " /usr/share/xfce4/AUTHORS \ - /usr/share/xfce4/BSD \ - /usr/share/xfce4/COPYING \ - /usr/share/xfce4/GPL \ - /usr/share/xfce4/INFO \ - /usr/share/xfce4/LGPL \ - /usr/share/xfce4/AUTHORS.html \ - /usr/share/xfce4/BSD.html \ - /usr/share/xfce4/COPYING.html \ - /usr/share/xfce4/GPL.html \ - /usr/share/xfce4/INFO.html \ - /usr/share/xfce4/LGPL.html" - -# NOTE: This package takes a --with-browser for the default browser -# NOTE: Works with gdm also gtkhtml diff --git a/packages/xfce4-goodies/xfce4-appfinder_4.2.0.bb b/packages/xfce4-goodies/xfce4-appfinder_4.2.0.bb deleted file mode 100644 index 0d102f3bd0..0000000000 --- a/packages/xfce4-goodies/xfce4-appfinder_4.2.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -# xfce4-appfinder build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="XFCE Application Finder" -SECTION = "x11" -inherit xfce -DEPENDS="libxfcegui4" diff --git a/packages/xfce4-goodies/xfce4-mixer_4.2.0.bb b/packages/xfce4-goodies/xfce4-mixer_4.2.0.bb deleted file mode 100644 index a923489f32..0000000000 --- a/packages/xfce4-goodies/xfce4-mixer_4.2.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -# xfce-mixer-plugin OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="XFCE panel mixer plugin" -SECTION = "x11" - -DEPENDS="xfce4-panel" -inherit xfce diff --git a/packages/xfce4-panel/xfce4-panel.inc b/packages/xfce4-panel/xfce4-panel.inc index 4950da6f68..30473eea06 100644 --- a/packages/xfce4-panel/xfce4-panel.inc +++ b/packages/xfce4-panel/xfce4-panel.inc @@ -2,17 +2,14 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -DESCRIPTION="XFCE4 Panel" +DESCRIPTION = "XFCE4 Panel" SECTION = "x11" -DEPENDS="startup-notification x11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2" +DEPENDS = "startup-notification x11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2" + inherit pkgconfig xfce EXTRA_OECONF += " --enable-startup-notification" -do_install() { - oe_runmake DESTDIR=${D} install -} - HEADERS="controls.h global.h icons.h main.h panel.h item.h \ item_dialog.h plugins.h xfce_support.h xfce.h" @@ -23,3 +20,10 @@ do_stage() { install -m 644 ${S}/panel/$file ${STAGING_INCDIR}/xfce4/panel/$file done } + +do_install() { + oe_runmake DESTDIR=${D} install +} + +PACKAGES += "${PN}-plugins" +FILES_${PN}-plugins += "${libdir}/xfce4/panel-plugins/*.so*" diff --git a/packages/xfce4-panel/xfce4-panel_4.2.0.bb b/packages/xfce4-panel/xfce4-panel_4.2.0.bb deleted file mode 100644 index 4950da6f68..0000000000 --- a/packages/xfce4-panel/xfce4-panel_4.2.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -# xfce4-panel OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="XFCE4 Panel" -SECTION = "x11" -DEPENDS="startup-notification x11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2" -inherit pkgconfig xfce - -EXTRA_OECONF += " --enable-startup-notification" - -do_install() { - oe_runmake DESTDIR=${D} install -} - -HEADERS="controls.h global.h icons.h main.h panel.h item.h \ - item_dialog.h plugins.h xfce_support.h xfce.h" - -do_stage() { - install -d ${STAGING_INCDIR}/xfce4/panel - - for file in ${HEADERS}; do - install -m 644 ${S}/panel/$file ${STAGING_INCDIR}/xfce4/panel/$file - done -} |