diff options
36 files changed, 809 insertions, 129 deletions
diff --git a/classes/package.bbclass b/classes/package.bbclass index d6a2193404..90dfec9fa7 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -481,7 +481,8 @@ python package_do_pkgconfig () { pkgconfig_needed[pkg] += exp.replace(',', ' ').split() for pkg in packages.split(): - pkgs_file = os.path.join(shlibs_dir, pkg + ".pclist") + ppkg = bb.data.getVar("PKG_" + pkg, d, 1) or pkg + pkgs_file = os.path.join(shlibs_dir, ppkg + ".pclist") if os.path.exists(pkgs_file): os.remove(pkgs_file) if pkgconfig_provided[pkg] != []: diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index 7535f63a01..6f321b50a6 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -103,7 +103,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" # Tracking the latest version, so the following is commented out. # Uncomment it before release! -#PREFERRED_VERSION_openslug-kernel ?= "2.6.12.2" +PREFERRED_VERSION_openslug-kernel ?= "2.6.12.2" PREFERRED_VERSION_ixp4xx-csr ?= "1.4" PREFERRED_VERSION_ixp425-eth ?= "1.1" diff --git a/conf/machine/tosa-2.4.conf b/conf/machine/tosa-2.4.conf index 22ade477e2..da1d1de542 100644 --- a/conf/machine/tosa-2.4.conf +++ b/conf/machine/tosa-2.4.conf @@ -2,19 +2,19 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" BOOTSTRAP_EXTRA_DEPENDS += "wlan-ng-modules wlan-ng-utils virtual/kernel hostap-modules \ - orinoco-modules sharp-sdmmc-support usbutils" -BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils kernel-module-acm \ - kernel-module-evdev kernel-module-net-fd \ - kernel-module-pxa-bi kernel-module-registers \ - kernel-module-storage-fd kernel-module-usb-ohci-tc6393 \ - kernel-module-usb-storage \ - kernel hostap-modules-cs orinoco-modules-cs \ - sharp-sdmmc-support kernel-module-pxa-bi \ - kernel-module-ip-gre \ - kernel-module-irnet kernel-module-ipip kernel-module-usbcore \ - kernel-module-usbdcore kernel-module-usbdmonitor" + orinoco-modules sharp-sdmmc-support usbutils console-tools" + +BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils console-tools \ + kernel-module-acm \ + kernel-module-evdev kernel-module-net-fd \ + kernel-module-pxa-bi kernel-module-registers \ + kernel-module-storage-fd kernel-module-usb-ohci-tc6393 \ + kernel hostap-modules-cs orinoco-modules-cs \ + sharp-sdmmc-support kernel-module-pxa-bi \ + kernel-module-ip-gre kernel-module-irnet kernel-module-ipip \ + kernel-module-usbcore kernel-module-usbdcore kernel-module-usbdmonitor kernel-module-usb-storage" RRECOMMENDS += "kernel-module-usbdserial kernel-module-usbkbd \ - kernel-module-usbmouse kernel-module-hid usbutils \ - kernel-module-evdev" + kernel-module-usbmouse kernel-module-hid usbutils \ + kernel-module-evdev" diff --git a/packages/binutils/binutils.inc b/packages/binutils/binutils.inc index 731f58ba2c..e544e9ef53 100644 --- a/packages/binutils/binutils.inc +++ b/packages/binutils/binutils.inc @@ -16,7 +16,6 @@ FILES_${PN}-dev = " \ FILES_${PN}-symlinks = " \ ${bindir}/addr2line \ - ${bindir}/ar \ ${bindir}/as \ ${bindir}/c++filt \ ${bindir}/gprof \ @@ -27,7 +26,6 @@ FILES_${PN}-symlinks = " \ ${bindir}/ranlib \ ${bindir}/readelf \ ${bindir}/size \ - ${bindir}/strings \ ${bindir}/strip" EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \ @@ -101,4 +99,19 @@ do_install () { for p in ${TARGET_SYS}-* ; do ln -sf $p `echo $p | sed -e s,${TARGET_SYS}-,,` done + + rm ${D}${bindir}/ar ${D}${bindir}/strings +} + + +pkg_postinst_${PN}-symlinks () { + update-alternatives --install ${bindir}/ar ar ${TARGET_SYS}-ar 100 + update-alternatives --install ${bindir}/strings strings ${TARGET_SYS}-strings 100 } + + +pkg_prerm_${PN}-symlinks () { + update-alternatives --remove ar ${TARGET_SYS}-ar + update-alternatives --remove strings ${TARGET_SYS}-strings +} + diff --git a/packages/binutils/binutils_2.16.bb b/packages/binutils/binutils_2.16.bb index 27e2f8983c..bb280f0fb5 100644 --- a/packages/binutils/binutils_2.16.bb +++ b/packages/binutils/binutils_2.16.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/" SECTION = "devel" LICENSE = "GPL" MAINTAINER = "Gerald Britton <gbritton@doomcom.org>" -PR = "r0" +PR = "r1" DEFAULT_PREFERENCE_linux-uclibc = "-1" diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb index 1a5b392b7d..056213c82c 100644 --- a/packages/busybox/busybox_1.00.bb +++ b/packages/busybox/busybox_1.00.bb @@ -10,7 +10,7 @@ HOMEPAGE = "http://www.busybox.net" LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -PR = "r27" +PR = "r28" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://add-getkey-applet.patch;patch=1 \ @@ -73,39 +73,89 @@ do_compile () { do_install () { install -d ${D}${sysconfdir}/init.d oe_runmake 'PREFIX=${D}' install + + # Move everything to /busybox (not supposed to end up in any package) + install -d ${D}/busybox + mv ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ${D}/busybox/ + # Move the busybox binary back to /bin + install -d ${D}${base_bindir} + mv ${D}/busybox${base_bindir}/busybox ${D}${base_bindir}/ + # Move back the sh symlink + mv ${D}/busybox${base_bindir}/sh ${D}${base_bindir}/ + install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/ install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/ if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then + # Move crond back to /usr/sbin/crond + install -d ${D}${sbindir} + mv ${D}/busybox${sbindir}/crond ${D}${sbindir}/ + install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/ fi if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then + # Move httpd back to /usr/sbin/httpd + install -d ${D}${sbindir} + mv ${D}/busybox${sbindir}/httpd ${D}${sbindir}/ + install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/ install -d ${D}/srv/www fi if grep "CONFIG_UDHCPD=y" ${WORKDIR}/defconfig; then + # Move udhcpd back to /usr/sbin/udhcpd + install -d ${D}${sbindir} + mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/ + install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/ fi if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then + # Move hwclock back to /sbin/hwclock + install -d ${D}${base_sbindir} + mv ${D}/busybox${base_sbindir}/hwclock ${D}${base_sbindir}/ + install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/ fi if grep "CONFIG_UDHCPC=y" ${WORKDIR}/defconfig; then + # Move dhcpc back to /usr/sbin/udhcpc + install -d ${D}${base_sbindir} + mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/ + install -d ${D}${sysconfdir}/udhcpc.d install -d ${D}${datadir}/udhcpc install -m 0755 ${S}/examples/udhcp/simple.script ${D}${sysconfdir}/udhcpc.d/50default install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script fi - rm ${D}${base_bindir}/mount - install -m 0755 ${WORKDIR}/mount.busybox ${D}${base_bindir}/ - rm ${D}${base_bindir}/umount - install -m 0755 ${WORKDIR}/umount.busybox ${D}${base_bindir}/ + + install -m 0644 ${S}/busybox.links ${D}${sysconfdir} } pkg_postinst_${PN} () { - update-alternatives --install /bin/mount mount /bin/mount.busybox 50 - update-alternatives --install /bin/umount umount /bin/umount.busybox 50 + # If we are not making an image we create links for the utilities that doesn't exist + # so the update-alternatives script will get the utilities it needs + # (update-alternatives have no problem replacing links later anyway) + alias test='busybox test' + if test "x$D" = "x"; then while read link; do if test ! -h "$link"; then case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; busybox ln -s $to $link; fi; done </etc/busybox.links; fi + + # This adds the links, remember that this has to work when building an image too, hence the $D + while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; update-alternatives --install $link $bn $to 50; done <$D/etc/busybox.links } pkg_prerm_${PN} () { - update-alternatives --remove mount /bin/mount.busybox - update-alternatives --remove umount /bin/umount.busybox + # This is so you can make busybox commit suicide - removing busybox with no other packages + # providing its files, this will make update-alternatives work, but the update-rc.d part + # for syslog, httpd and/or udhcpd will fail if there is no other package providing sh + tmpdir=`mktemp -d /tmp/busyboxrm-XXXXXX` + ln -s /bin/busybox $tmpdir/[ + ln -s /bin/busybox $tmpdir/test + ln -s /bin/busybox $tmpdir/head + ln -s /bin/busybox $tmpdir/sh + ln -s /bin/busybox $tmpdir/basename + ln -s /bin/busybox $tmpdir/echo + ln -s /bin/busybox $tmpdir/mv + ln -s /bin/busybox $tmpdir/ln + ln -s /bin/busybox $tmpdir/dirname + ln -s /bin/busybox $tmpdir/rm + ln -s /bin/busybox $tmpdir/sed + ln -s /bin/busybox $tmpdir/sort + export PATH=$PATH:$tmpdir + while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; sh /usr/bin/update-alternatives --remove $bn $to; done </etc/busybox.links } diff --git a/packages/bzip2/bzip2_1.0.2.bb b/packages/bzip2/bzip2_1.0.2.bb index 0233f0f235..1e1cb8e539 100644 --- a/packages/bzip2/bzip2_1.0.2.bb +++ b/packages/bzip2/bzip2_1.0.2.bb @@ -1,5 +1,6 @@ DESCRIPTION = "Very high-quality data compression program." SECTION = "console/utils" +PR = "r1" LICENSE = "bzip2" SRC_URI = "ftp://sources.redhat.com/pub/bzip2/v102/bzip2-${PV}.tar.gz \ @@ -23,4 +24,18 @@ do_stage () { do_install () { oe_runmake 'DESTDIR=${D}' install oe_libinstall -a -so libbz2 ${D}${libdir} + mv ${D}${bindir}/bunzip2 ${D}${bindir}/bunzip2.${PN} + mv ${D}${bindir}/bzcat ${D}${bindir}/bzcat.${PN} +} + + +pkg_postinst_${PN} () { + update-alternatives --install ${bindir}/bunzip2 bunzip2 bunzip2.${PN} 100 + update-alternatives --install ${bindir}/bzcat bzcat bzcat.${PN} 100 +} + + +pkg_prerm_${PN} () { + update-alternatives --remove bunzip2 bunzip2.${PN} + update-alternatives --remove bzcat bzcat.${PN} } diff --git a/packages/console-tools/console-tools_0.3.2.bb b/packages/console-tools/console-tools_0.3.2.bb index 7cf684c589..2a94a4f896 100644 --- a/packages/console-tools/console-tools_0.3.2.bb +++ b/packages/console-tools/console-tools_0.3.2.bb @@ -1,6 +1,7 @@ SECTION = "base" LICENSE = "GPL" DESCRIPTION = "Allows you to set-up and manipulate the Linux console." +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \ file://codepage.patch;patch=1 \ @@ -23,3 +24,23 @@ do_compile () { } inherit autotools + +do_install () { + autotools_do_install + mv ${D}${bindir}/chvt ${D}${bindir}/chvt.${PN} + mv ${D}${bindir}/deallocvt ${D}${bindir}/deallocvt.${PN} + mv ${D}${bindir}/openvt ${D}${bindir}/openvt.${PN} +} + +pkg_postinst_${PN} () { + update-alternatives --install ${bindir}/chvt chvt chvt.${PN} 100 + update-alternatives --install ${bindir}/deallocvt deallocvt deallocvt.${PN} 100 + update-alternatives --install ${bindir}/openvt openvt openvt.${PN} 100 +} + +pkg_prerm_${PN} () { + update-alternatives --remove chvt chvt.${PN} + update-alternatives --remove deallocvt deallocvt.${PN} + update-alternatives --remove openvt openvt.${PN} +} + diff --git a/packages/coreutils/coreutils_5.1.3.bb b/packages/coreutils/coreutils_5.1.3.bb index 6290a4984d..47c734446f 100644 --- a/packages/coreutils/coreutils_5.1.3.bb +++ b/packages/coreutils/coreutils_5.1.3.bb @@ -3,10 +3,65 @@ SECTION = "base" DESCRIPTION = "A collection of core GNU utilities." RREPLACES = "textutils shellutils fileutils" RPROVIDES = "textutils shellutils fileutils" -PR = "r1" +PR = "r2" SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \ file://install-cross.patch;patch=1;pnum=0 \ file://man.patch;patch=1" inherit autotools + +bindir_progs = "basename cksum comm csplit cut dir dircolors dirname du \ + env expand expr factor fmt fold groups head hostid id install \ + join link logname md5sum mkfifo nice nl nohup od paste pathchk \ + pinky pr printenv printf ptx readlink seq sha1sum shred sort \ + split stat sum tac tail tee test tr tsort tty unexpand uniq \ + unlink uptime users vdir wc who whoami yes \ + " + +base_bindir_progs = "cat chgrp chmod chown cp date dd echo false hostname kill \ + ln ls mkdir mknod mv pwd rm rmdir sleep stty sync touch \ + true uname \ + " + +sbindir_progs= "chroot" + +do_install () { + autotools_do_install + + # Renaming the utilities that should go in /usr/bin + for i in ${bindir_progs}; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}; done + mv ${D}${bindir}/[ ${D}${bindir}/[.${PN} + + # Renaming and moving the utilities that should go in /bin (FHS) + install -d ${D}${base_bindir} + for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${PN}; done + + # Renaming and moving the utilities that should go in /usr/sbin (FHS) + install -d ${D}${sbindir} + for i in ${sbindir_progs}; do mv ${D}${bindir}/$i ${D}${sbindir}/$i.${PN}; done +} + +pkg_postinst_${PN} () { + # The utilities in /usr/bin + for i in ${bindir_progs}; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done + update-alternatives --install "${bindir}/\[" "\[" "\[.${PN}" 100 + + # The utilities in /bin + for i in ${base_bindir_progs}; do update-alternatives --install ${base_bindir}/$i $i $i.${PN} 100; done + + # The utilities in /usr/sbin + for i in ${sbindir_progs}; do update-alternatives --install ${sbindir}/$i $i $i.${PN} 100; done +} + +pkg_prerm_${PN} () { + # The utilities in /usr/bin + for i in ${bindir_progs}; do update-alternatives --remove $i $i.${PN}; done + update-alternatives --remove "\[" "\[.${PN}" + + # The utilities in /bin + for i in ${base_bindir_progs}; do update-alternatives --remove $i $i.${PN}; done + + # The utilities in /usr/sbin + for i in ${sbindir_progs}; do update-alternatives --remove $i $i.${PN}; done +} diff --git a/packages/cpio/cpio_2.5.bb b/packages/cpio/cpio_2.5.bb index 020ca5895b..e7ee85e001 100644 --- a/packages/cpio/cpio_2.5.bb +++ b/packages/cpio/cpio_2.5.bb @@ -3,10 +3,26 @@ HOMEPAGE = "http://www.gnu.org/software/cpio/" SECTION = "console" LICENSE = "GPL" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" -PR = "r2" +PR = "r3" SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \ file://install.patch;patch=1" S = "${WORKDIR}/cpio-${PV}" inherit autotools + +do_install () { + autotools_do_install + mv ${D}${libexecdir}/rmt ${D}${libexecdir}/rmt.${PN} +} + + +pkg_postinst_${PN} () { + update-alternatives --install ${libexecdir}/rmt rmt rmt.${PN} 50 +} + + +pkg_prerm_${PN} () { + update-alternatives --remove rmt rmt.${PN} +} + diff --git a/packages/gawk/gawk_3.1.4.bb b/packages/gawk/gawk_3.1.4.bb index 0ebcbce588..bf93f7e201 100644 --- a/packages/gawk/gawk_3.1.4.bb +++ b/packages/gawk/gawk_3.1.4.bb @@ -2,9 +2,9 @@ LICENSE = "GPL" SECTION = "interpreters" DESCRIPTION = "A program that you can use to select particular records in a \ file and perform operations upon them." -PR = "r1" +PR = "r2" PACKAGES += "gawk-common pgawk" -FILES_${PN} = "${bindir}/gawk* ${bindir}/igawk ${bindir}/awk*" +FILES_${PN} = "${bindir}/gawk* ${bindir}/igawk" FILES_gawk-common += "${datadir}/awk ${libexecdir}/awk" FILES_pgawk = "${bindir}/pgawk*" RDEPENDS_gawk += "gawk-common" @@ -17,3 +17,13 @@ inherit autotools do_configure_prepend () { grep -E '^AC_DEFUN' m4/*.m4|grep -E '\(\[?(AM|AC)_'|xargs rm -f } + +pkg_postinst_${PN} () { + update-alternatives --install ${bindir}/awk awk gawk 100 +} + + +pkg_prerm_${PN} () { + update-alternatives --remove awk gawk +} + diff --git a/packages/gcc/gcc-cross-sdk_3.3.4.bb b/packages/gcc/gcc-cross-sdk_3.3.4.bb index 562f67114a..e298b1caa1 100644 --- a/packages/gcc/gcc-cross-sdk_3.3.4.bb +++ b/packages/gcc/gcc-cross-sdk_3.3.4.bb @@ -3,7 +3,11 @@ HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" LICENSE = "GPL" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -PR = "r1" +PR = "r2" +include gcc_${PV}.bb + +# Files for these are defined in the main gcc.oe +#PACKAGES = "libgcc libstdc++ libg2c" inherit autotools sdk @@ -75,6 +79,39 @@ do_compile () { oe_runmake CFLAGS_FOR_TARGET="-I${STAGING_TARGET_INCDIR}" } -do_install () { - autotools_do_install +#do_install () { +# autotools_do_install +#} + +python do_package() { + if bb.data.getVar('DEBIAN_NAMES', d, 1): + bb.data.setVar('PKG_libgcc', 'libgcc1', d) + bb.build.exec_func('package_do_package', d) } + +do_install () { + oe_runmake 'DESTDIR=${D}' install + + # Move libgcc_s into /lib + mkdir -p ${D}${base_libdir} + if [ "${BUILD_SYS}" == "${TARGET_SYS}" ]; then + # native builds drop one pathname component + mv -f ${D}${prefix}/lib/libgcc_s.so.* ${D}${base_libdir} + else + mv -f ${D}${prefix}/*/lib/libgcc_s.so.* ${D}${base_libdir} + fi + + # Move libstdc++ and libg2c into libdir (resetting our prefix to /usr + TGT_LIBDIR=`echo ${libdir} | sed -e 's,${CROSS_DIR},/usr,'` + mkdir -p ${D}${TGT_LIBDIR} + mv -f ${D}${prefix}/*/lib/libstdc++.so.* ${D}${TGT_LIBDIR} + mv -f ${D}${prefix}/*/lib/libg2c.so.* ${D}${TGT_LIBDIR} + + # Manually run the target stripper since we won't get it run by + # the packaging. + if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then + ${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libstdc++.so.* + ${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libg2c.so.* + ${TARGET_PREFIX}strip ${D}${base_libdir}/libgcc_s.so.* + fi +}
\ No newline at end of file diff --git a/packages/gcc/gcc-package.inc b/packages/gcc/gcc-package.inc index b71a45c200..b31a209b34 100644 --- a/packages/gcc/gcc-package.inc +++ b/packages/gcc/gcc-package.inc @@ -106,4 +106,5 @@ do_install () { ln -sf g++ c++ ln -sf gcc cc ln -sf ${bindir}/${TARGET_SYS}-cpp ${D}${base_libdir}/cpp + ln -sf ${bindir}/${TARGET_SYS}-cpp ${D}${bindir}/cpp } diff --git a/packages/gcc/gcc_3.4.4.bb b/packages/gcc/gcc_3.4.4.bb index 804e837452..263d78396c 100644 --- a/packages/gcc/gcc_3.4.4.bb +++ b/packages/gcc/gcc_3.4.4.bb @@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" diff --git a/packages/gnome/gconf-dbus_cvs.bb b/packages/gnome/gconf-dbus_cvs.bb index 71ff770f52..a403fae24c 100644 --- a/packages/gnome/gconf-dbus_cvs.bb +++ b/packages/gnome/gconf-dbus_cvs.bb @@ -4,10 +4,11 @@ DESCRIPTION = "Settings daemon using DBUS for communication." LICENSE = "GPL" MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" PROVIDES = "gconf" -RPROVIDES = "gconf" +RPROVIDES_${PN} = "gconf" +RPROVIDES_${PN}-dev = "gconf-dev" PV = "0.0cvs${CVSDATE}" -PR = "r5" +PR = "r6" SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=gconf;tag=gconf-dbus-2-6 \ file://gconf-dbus-update.patch;patch=1;pnum=0 \ diff --git a/packages/gpsdrive/files/gpsdrive-pda-fix.patch b/packages/gpsdrive/files/gpsdrive-pda-fix.patch new file mode 100644 index 0000000000..85f220bd16 --- /dev/null +++ b/packages/gpsdrive/files/gpsdrive-pda-fix.patch @@ -0,0 +1,72 @@ +--- gpsdrive/src/gpsdrive.c 2005-07-22 23:17:36.452918848 +0200 ++++ gpsdrive/src/gpsdrive.c 2005-07-23 01:02:40.482560672 +0200 +@@ -10516,7 +10516,7 @@ + PangoFontDescription *font_desc; + font_desc = + pango_font_description_from_string +- ("Sans 20"); ++ ("Sans 10"); + gtk_widget_modify_font (myroutelist, font_desc); + pango_font_description_free (font_desc); + } +@@ -12343,6 +12343,8 @@ + GDK_BUTTON_PRESS_MASK); + gtk_signal_connect (GTK_OBJECT (drawing_sats), "button-press-event", + GTK_SIGNAL_FUNC (satpos_cb), NULL); ++ if(!pdamode) ++ { + frame_sats = gtk_frame_new (_("GPS Info")); + sateventbox = gtk_event_box_new (); + gtk_container_add (GTK_CONTAINER (sateventbox), drawing_sats); +@@ -12386,7 +12388,7 @@ + + gtk_box_pack_start (GTK_BOX (hbox2), frame_sats, FALSE, FALSE, + 1 * PADDING); +- ++ } + havebattery = battery_get_values (); + if (debug) + fprintf (stderr, "batt: %d, temp: %d\n", havebattery, +@@ -12569,9 +12571,11 @@ + /* if (!pdamode) */ + /* gtk_box_pack_start (GTK_BOX (hbox2), frame_speed, TRUE, TRUE, */ + /* 1 * PADDING); */ +- ++ if (!pdamode) ++ { + frame_altitude = gtk_frame_new (_("Altitude")); + gtk_container_add (GTK_CONTAINER (frame_altitude), altilabel); ++ } + /*** Mod by Arms */ + /* if (!pdamode) */ + /* gtk_box_pack_start (GTK_BOX (hbox2), frame_altitude, FALSE, TRUE, */ +@@ -12904,23 +12908,23 @@ + if (onemousebutton) + { + /* gtk_misc_set_padding (GTK_MISC (l1), x, y); */ +- gtk_misc_set_padding (GTK_MISC (l1), 50, 1); +- gtk_misc_set_padding (GTK_MISC (l2), 50, 1); +- gtk_misc_set_padding (GTK_MISC (l3), 50, 1); ++ gtk_misc_set_padding (GTK_MISC (l1), 20, 1); ++ gtk_misc_set_padding (GTK_MISC (l2), 20, 1); ++ gtk_misc_set_padding (GTK_MISC (l3), 20, 1); + + /* http://developer.gnome.org/doc/API/2.0/pango/PangoMarkupFormat.html */ + + char *markup; + markup = g_markup_printf_escaped +- ("<span weight='heavy' stretch='ultraexpanded' size='20480'>%s</span>", ++ ("<span font_desc='10'>%s</span>", + _("Map")); + gtk_label_set_markup (GTK_LABEL (l1), markup); + markup = g_markup_printf_escaped +- ("<span weight='heavy' stretch='ultraexpanded' size='20480'>%s</span>", ++ ("<span font_desc='10'>%s</span>", + _("Menu")); + gtk_label_set_markup (GTK_LABEL (l2), markup); + markup = g_markup_printf_escaped +- ("<span weight='heavy' stretch='ultraexpanded' size='20480'>%s</span>", ++ ("<span font_desc='10'>%s</span>", + _("Status")); + gtk_label_set_markup (GTK_LABEL (l3), markup); + diff --git a/packages/gpsdrive/gpsdrive_cvs.bb b/packages/gpsdrive/gpsdrive_cvs.bb index cc623451ef..ba4432f5ca 100644 --- a/packages/gpsdrive/gpsdrive_cvs.bb +++ b/packages/gpsdrive/gpsdrive_cvs.bb @@ -1,6 +1,6 @@ inherit autotools pkgconfig -PR = "r0" +PR = "r1" PV = "2.10pre3+cvs-${CVSDATE}" DEFAULT_PREFERENCE="-1" @@ -14,6 +14,7 @@ PRIORITY = "optional" LICENSE = "GPL" SRC_URI = "cvs://anonymous@cvs.gpsdrive.cc/cvsroot;module=gpsdrive \ + file://gpsdrive-pda-fix.patch;patch=1;pnum=1 \ file://gpsdrive.desktop" S = "${WORKDIR}/gpsdrive" diff --git a/packages/grep/grep_2.5.1.bb b/packages/grep/grep_2.5.1.bb index 0f18902190..8f6b9b39a7 100644 --- a/packages/grep/grep_2.5.1.bb +++ b/packages/grep/grep_2.5.1.bb @@ -2,6 +2,7 @@ LICENSE = "GPL" SECTION = "console/utils" DESCRIPTION = "grep GNU utility" MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>" +PR = "r1" SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2" @@ -13,3 +14,24 @@ do_configure () { rm -f ${S}/m4/init.m4 autotools_do_configure } + +do_install () { + autotools_do_install + install -d ${D}${base_bindir} + mv ${D}${bindir}/grep ${D}${base_bindir}/grep.${PN} + mv ${D}${bindir}/egrep ${D}${base_bindir}/egrep.${PN} + mv ${D}${bindir}/fgrep ${D}${base_bindir}/fgrep.${PN} +} + + +pkg_postinst_${PN} () { + update-alternatives --install ${base_bindir}/grep grep grep.${PN} 100 + update-alternatives --install ${base_bindir}/egrep egrep egrep.${PN} 100 + update-alternatives --install ${base_bindir}/fgrep fgrep fgrep.${PN} 100 +} + +pkg_prerm_${PN} () { + update-alternatives --remove grep grep.${PN} + update-alternatives --remove egrep egrep.${PN} + update-alternatives --remove fgrep fgrep.${PN} +} diff --git a/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map b/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map index dc7fa37401..85a194b850 100755 --- a/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map +++ b/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map @@ -143,71 +143,71 @@ string Prior = "\033[5~" string Next = "\033[6~" string Macro = "\033[M" string Pause = "\033[P" -compose '`' 'A' to 'À' -compose '`' 'a' to 'à' -compose '\'' 'A' to 'Á' -compose '\'' 'a' to 'á' -compose '^' 'A' to 'Â' -compose '^' 'a' to 'â' -compose '~' 'A' to 'Ã' -compose '~' 'a' to 'ã' -compose '"' 'A' to 'Ä' -compose '"' 'a' to 'ä' -compose 'O' 'A' to 'Å' -compose 'o' 'a' to 'å' -compose '0' 'A' to 'Å' -compose '0' 'a' to 'å' -compose 'A' 'A' to 'Å' -compose 'a' 'a' to 'å' -compose 'A' 'E' to 'Æ' -compose 'a' 'e' to 'æ' -compose ',' 'C' to 'Ç' -compose ',' 'c' to 'ç' -compose '`' 'E' to 'È' -compose '`' 'e' to 'è' -compose '\'' 'E' to 'É' -compose '\'' 'e' to 'é' -compose '^' 'E' to 'Ê' -compose '^' 'e' to 'ê' -compose '"' 'E' to 'Ë' -compose '"' 'e' to 'ë' -compose '`' 'I' to 'Ì' -compose '`' 'i' to 'ì' -compose '\'' 'I' to 'Í' -compose '\'' 'i' to 'í' -compose '^' 'I' to 'Î' -compose '^' 'i' to 'î' -compose '"' 'I' to 'Ï' -compose '"' 'i' to 'ï' -compose '-' 'D' to 'Ð' -compose '-' 'd' to 'ð' -compose '~' 'N' to 'Ñ' -compose '~' 'n' to 'ñ' -compose '`' 'O' to 'Ò' -compose '`' 'o' to 'ò' -compose '\'' 'O' to 'Ó' -compose '\'' 'o' to 'ó' -compose '^' 'O' to 'Ô' -compose '^' 'o' to 'ô' -compose '~' 'O' to 'Õ' -compose '~' 'o' to 'õ' -compose '"' 'O' to 'Ö' -compose '"' 'o' to 'ö' -compose '/' 'O' to 'Ø' -compose '/' 'o' to 'ø' -compose '`' 'U' to 'Ù' -compose '`' 'u' to 'ù' -compose '\'' 'U' to 'Ú' -compose '\'' 'u' to 'ú' -compose '^' 'U' to 'Û' -compose '^' 'u' to 'û' -compose '"' 'U' to 'Ü' -compose '"' 'u' to 'ü' -compose '\'' 'Y' to 'Ý' -compose '\'' 'y' to 'ý' -compose 'T' 'H' to 'Þ' -compose 't' 'h' to 'þ' -compose 's' 's' to 'ß' -compose '"' 'y' to 'ÿ' -compose 's' 'z' to 'ß' -compose 'i' 'j' to 'ÿ' +compose '`' 'A' to '� +compose '`' 'a' to '� +compose '\'' 'A' to '� +compose '\'' 'a' to '� +compose '^' 'A' to '� +compose '^' 'a' to '� +compose '~' 'A' to '� +compose '~' 'a' to '� +compose '"' 'A' to '� +compose '"' 'a' to '� +compose 'O' 'A' to '� +compose 'o' 'a' to '� +compose '0' 'A' to '� +compose '0' 'a' to '� +compose 'A' 'A' to '� +compose 'a' 'a' to '� +compose 'A' 'E' to '� +compose 'a' 'e' to '� +compose ',' 'C' to '� +compose ',' 'c' to '� +compose '`' 'E' to '� +compose '`' 'e' to '� +compose '\'' 'E' to '� +compose '\'' 'e' to '� +compose '^' 'E' to '� +compose '^' 'e' to '� +compose '"' 'E' to '� +compose '"' 'e' to '� +compose '`' 'I' to '� +compose '`' 'i' to '� +compose '\'' 'I' to '� +compose '\'' 'i' to '� +compose '^' 'I' to '� +compose '^' 'i' to '� +compose '"' 'I' to '� +compose '"' 'i' to '� +compose '-' 'D' to '� +compose '-' 'd' to '� +compose '~' 'N' to '� +compose '~' 'n' to '� +compose '`' 'O' to '� +compose '`' 'o' to '� +compose '\'' 'O' to '� +compose '\'' 'o' to '� +compose '^' 'O' to '� +compose '^' 'o' to '� +compose '~' 'O' to '� +compose '~' 'o' to '� +compose '"' 'O' to '� +compose '"' 'o' to '� +compose '/' 'O' to '� +compose '/' 'o' to '' +compose '`' 'U' to '� +compose '`' 'u' to '' +compose '\'' 'U' to '� +compose '\'' 'u' to '' +compose '^' 'U' to '� +compose '^' 'u' to '' +compose '"' 'U' to '� +compose '"' 'u' to '' +compose '\'' 'Y' to '� +compose '\'' 'y' to '' +compose 'T' 'H' to '� +compose 't' 'h' to '' +compose 's' 's' to '� +compose '"' 'y' to '' +compose 's' 'z' to '� +compose 'i' 'j' to '' diff --git a/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map b/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map new file mode 100644 index 0000000000..4a6bca982d --- /dev/null +++ b/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map @@ -0,0 +1,131 @@ +keymaps 0-1,4-5 +alt_is_meta +keycode 1 = a +keycode 2 = b +keycode 3 = c +keycode 4 = d +keycode 5 = e +keycode 6 = f +keycode 7 = g +keycode 8 = h +keycode 9 = i +keycode 10 = j +keycode 11 = k +keycode 12 = l +keycode 13 = m +keycode 14 = n +keycode 15 = o +keycode 16 = p +keycode 17 = q +keycode 18 = r +keycode 19 = s +keycode 20 = t +keycode 21 = u +keycode 22 = v +keycode 23 = w +keycode 24 = x +keycode 25 = y +keycode 26 = z +keycode 27 = Shift +keycode 28 = Return +keycode 29 = F11 +keycode 30 = AltGr +keycode 31 = BackSpace +keycode 32 = bar +keycode 33 = F15 +keycode 34 = Escape +keycode 35 = Left +keycode 36 = Up +keycode 37 = Down +keycode 38 = Right +keycode 39 = Return +keycode 40 = F12 +keycode 41 = one +keycode 42 = two +keycode 43 = three +keycode 44 = four +keycode 45 = five +keycode 46 = six +keycode 47 = seven +keycode 48 = eight +keycode 49 = nine +keycode 50 = zero +keycode 51 = +adiaeresis +keycode 52 = +udiaeresis +keycode 53 = +odiaeresis +keycode 54 = +Adiaeresis +keycode 55 = +Udiaeresis +keycode 56 = +Odiaeresis +keycode 57 = +ssharp +keycode 58 = minus +keycode 59 = plus +keycode 60 = Shift_Lock +keycode 61 = at +keycode 62 = question +keycode 63 = comma +keycode 64 = period +keycode 65 = Tab +keycode 66 = F5 +keycode 67 = F6 +keycode 68 = F7 +keycode 69 = slash +keycode 70 = apostrophe +keycode 71 = semicolon +keycode 72 = quotedbl +keycode 73 = colon +keycode 74 = numbersign +keycode 75 = dollar +keycode 76 = percent +keycode 77 = underscore +keycode 78 = ampersand +keycode 79 = asterisk +keycode 80 = parenleft +keycode 81 = Delete +keycode 82 = F10 +keycode 83 = equal +keycode 84 = parenright +keycode 85 = asciitilde +keycode 86 = less +keycode 87 = greater +keycode 88 = F9 +keycode 89 = F10 +keycode 90 = F13 +keycode 91 = space + control keycode 91 = nul +keycode 92 = space + control keycode 92 = nul +keycode 93 = +keycode 94 = exclam +keycode 95 = +keycode 96 = +keycode 97 = +keycode 98 = +keycode 99 = +keycode 100 = +keycode 101 = +keycode 102 = +keycode 103 = Shift +keycode 104 = Control +keycode 105 = Control +keycode 106 = Alt +keycode 107 = Alt +keycode 108 = AltGr +keycode 109 = +keycode 110 = +keycode 111 = +keycode 112 = +keycode 113 = +keycode 114 = +keycode 115 = +keycode 116 = +keycode 117 = +keycode 118 = +keycode 119 = +keycode 120 = F24 +keycode 121 = +keycode 122 = +keycode 123 = +keycode 124 = +keycode 125 = +keycode 126 = +keycode 127 = diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index f61f1e8128..76755e1744 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -6,7 +6,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r50" +PR = "r51" SRC_URI = "file://halt \ file://ramdisk \ diff --git a/packages/libusb/libusb_0.1.10a.bb b/packages/libusb/libusb_0.1.10a.bb index bcf723a0c6..7f8fd42a4b 100644 --- a/packages/libusb/libusb_0.1.10a.bb +++ b/packages/libusb/libusb_0.1.10a.bb @@ -2,10 +2,9 @@ DESCRIPTION = "libusb is a library to provide userspace \ access to USB devices." SECTION = "libs" LICENSE = "LGPL" -PR = "r3" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.gz \ - file://ARMfix.patch;patch=1 \ file://debian-changes.patch;patch=1" inherit autotools pkgconfig diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb index 757c72ecb3..565988763b 100644 --- a/packages/meta/meta-sdk.bb +++ b/packages/meta/meta-sdk.bb @@ -1,6 +1,7 @@ -PR = "r2" - +PR = "r4" +LICENSE = MIT DEPENDS = "ipkg-native ipkg-utils-native binutils-cross-sdk gcc-cross-sdk gdb-cross fakeroot-native meta-gpe" +DEPENDS += "libidl libsvg-cairo sed-native" PACKAGES = "" @@ -19,7 +20,7 @@ compositeext-dev \ damageext-dev \ dbus-dev \ fixesext-dev \ -gconf-dev \ +gconf-dbus-dev \ gtk+-dev \ gtk-engines-dev \ libapm-dev \ @@ -86,17 +87,15 @@ libxtst-dev \ libz-dev \ matchbox-desktop-dev \ ncurses-dev \ -orbit2-dev \ pango-dev \ randrext-dev \ recordext-dev \ renderext-dev \ resourceext-dev \ -rxvt-unicode-dev \ -wireless-tools-dev \ +libiw-dev \ xcalibrateext-dev \ xextensions-dev \ -xmu-dev \ +libxmu-dev \ xproto-dev \ xtrans-dev \ " @@ -148,12 +147,24 @@ EOF echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libpthread.so echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so # remove unwanted housekeeping files - mv ${SDK_OUTPUT}${libdir}/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status + mv ${SDK_OUTPUT}${libdir}/../arm-linux/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status rm -rf ${SDK_OUTPUT}${libdir}/ipkg # remove unwanted executables rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc + # remove broken .la files + rm ${SDK_OUTPUT}/${prefix}/arm-linux/lib/*.la + + # fix pkgconfig data files + cd ${SDK_OUTPUT}/${prefix}/arm-linux/lib/pkgconfig + for f in *.pc ; do + sed -i 's%=/usr%=${prefix}/arm-linux%g' "$f" + done + for f in *.pc ; do + sed -i 's%${STAGING_DIR}%/usr/local/arm/oe%g' "$f" + done + mkdir -p ${SDK_DEPLOY} cd ${SDK_OUTPUT} fakeroot tar cfj ${SDK_DEPLOY}/oe-sdk-$(date +"%Y%m%d%H%M%S").tar.bz2 . @@ -161,4 +172,3 @@ EOF do_populate_sdk[nostamp] = 1 addtask populate_sdk before do_build after do_install -LICENSE = MIT diff --git a/packages/meta/openslug-native.bb b/packages/meta/openslug-native.bb new file mode 100644 index 0000000000..4ac2cfd4b1 --- /dev/null +++ b/packages/meta/openslug-native.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "Packages that are required for the OpenSlug native build environment" +LICENSE = MIT +PR = "r2" + +INHIBIT_DEFAULT_DEPS = "1" +ALLOW_EMPTY = 1 +PACKAGES = "${PN}" + +OPENSLUG_NATIVE = "\ + automake \ + bash \ + binutils binutils-dev \ + bison \ + bzip2 \ + coreutils \ + cpp \ + cvs \ + flex \ + gawk \ + g++ g++-symlinks \ + gcc gcc-symlinks \ + glibc-extra-nss glibc-utils \ + gnu-config \ + libc6 libc6-dev \ + libg2c-dev \ + libgdbm3 \ + libperl5 \ + libreadline4 libreadline-dev \ + libstdc++-dev \ + libthread-db1 \ + lrzsz \ + m4 \ + make \ + ncurses ncurses-dev ncurses-terminfo \ + patch \ + sed \ + tar \ + util-linux \ + wget \ + " + +RDEPENDS = '${OPENSLUG_NATIVE}' diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 3fb0587727..37ad7ba542 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -114,4 +114,5 @@ BROKEN_PACKAGES = "\ DEPENDS = 'openslug-image \ ${OPENSLUG_PACKAGES} \ ${OPENSLUG_DEVELOPMENT} \ + openslug-native \ package-index' diff --git a/packages/mozilla/firefox_1.0.6.bb b/packages/mozilla/firefox_1.0.6.bb index 4a7b79454c..b3eeedcf64 100644 --- a/packages/mozilla/firefox_1.0.6.bb +++ b/packages/mozilla/firefox_1.0.6.bb @@ -8,8 +8,6 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/ S = "${WORKDIR}/mozilla" -EXCLUDE_FROM_SHLIBS = "1" - inherit mozilla include firefox.inc diff --git a/packages/mozilla/minimo_cvs.bb b/packages/mozilla/minimo_cvs.bb index cb23f60255..917ff34019 100644 --- a/packages/mozilla/minimo_cvs.bb +++ b/packages/mozilla/minimo_cvs.bb @@ -14,8 +14,6 @@ FILES_${PN} += "${libdir}/mozilla-minimo" PR = "r8" LICENSE = "MPL/LGPL/GPL" -EXCLUDE_FROM_SHLIBS = "1" - inherit mozilla EXTRA_OECONF += "--enable-application=suite" diff --git a/packages/ncurses/ncurses.inc b/packages/ncurses/ncurses.inc index 58e7b59e59..f400617dcb 100644 --- a/packages/ncurses/ncurses.inc +++ b/packages/ncurses/ncurses.inc @@ -12,7 +12,7 @@ inherit autotools # This keeps only tput/tset in ncurses # clear/reset are in already busybox -FILES_ncurses-tools = "${bindir}/tic ${bindir}/toe ${bindir}/infotocap ${bindir}/captoinfo ${bindir}/infocmp ${bindir}/clear ${bindir}/reset ${bindir}/tack " +FILES_ncurses-tools = "${bindir}/tic ${bindir}/toe ${bindir}/infotocap ${bindir}/captoinfo ${bindir}/infocmp ${bindir}/clear.${PN} ${bindir}/reset.${PN} ${bindir}/tack " FILES_ncurses-terminfo = "${datadir}/terminfo" FILES_${PN} = "${bindir}/tput ${bindir}/tset ${libdir}/lib*.so.* usr/share/tabset etc/terminfo" @@ -73,4 +73,19 @@ do_install() { then ln -sf xterm-color ${D}${sysconfdir}/terminfo/x/xterm fi + + mv ${D}${bindir}/clear ${D}${bindir}/clear.${PN} + mv ${D}${bindir}/reset ${D}${bindir}/reset.${PN} +} + + +pkg_postinst_ncurses-tools () { + update-alternatives --install ${bindir}/clear clear clear.${PN} 100 + update-alternatives --install ${bindir}/reset reset reset.${PN} 100 +} + + +pkg_prerm_ncurses-tools () { + update-alternatives --remove clear clear.${PN} + update-alternatives --remove reset reset.${PN} } diff --git a/packages/ncurses/ncurses_5.4.bb b/packages/ncurses/ncurses_5.4.bb index 61909d5ff2..5b03eaaeed 100644 --- a/packages/ncurses/ncurses_5.4.bb +++ b/packages/ncurses/ncurses_5.4.bb @@ -1,4 +1,4 @@ -PR = "r7" +PR = "r8" SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \ file://visibility.patch;patch=1" diff --git a/packages/sed/sed_4.1.2.bb b/packages/sed/sed_4.1.2.bb index eac4a9cec3..fe80f3e687 100644 --- a/packages/sed/sed_4.1.2.bb +++ b/packages/sed/sed_4.1.2.bb @@ -1,8 +1,26 @@ LICENSE = "GPL" SECTION = "console/utils" DESCRIPTION = "sed is a Stream EDitor." +PR = "r1" SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.gz" S = "${WORKDIR}/sed-${PV}" inherit autotools + +do_install () { + autotools_do_install + install -d ${D}${base_bindir} + mv ${D}${bindir}/sed ${D}${base_bindir}/sed.${PN} +} + + +pkg_postinst_${PN} () { + update-alternatives --install ${base_bindir}/sed sed sed.${PN} 100 +} + + +pkg_prerm_${PN} () { + update-alternatives --remove sed sed.${PN} +} + diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb index d7b68ebce7..cfe616417a 100644 --- a/packages/sysvinit/sysvinit_2.86.bb +++ b/packages/sysvinit/sysvinit_2.86.bb @@ -3,7 +3,7 @@ SECTION = "base" LICENSE = "GPL" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" HOMEPAGE = "http://freshmeat.net/projects/sysvinit/" -PR = "r15" +PR = "r16" # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf. # Set PACKAGE_ARCH appropriately. @@ -40,7 +40,7 @@ ALTERNATIVE_PRIORITY = "50" PACKAGES =+ "sysvinit-pidof sysvinit-sulogin" FILES_${PN} += "${base_sbindir} ${base_bindir}" -FILES_sysvinit-pidof = "${base_bindir}/pidof" +FILES_sysvinit-pidof = "${base_bindir}/pidof.sysvinit" FILES_sysvinit-sulogin = "${base_sbindir}/sulogin" CFLAGS_prepend = "-D_GNU_SOURCE " @@ -89,5 +89,38 @@ EOF install -d ${D}${sysconfdir}/rc$level.d ln -s ../init.d/stop-bootlogd ${D}${sysconfdir}/rc$level.d/S99stop-bootlogd done - mv ${D}${base_sbindir}/init ${D}${base_sbindir}/init.sysvinit + mv ${D}${base_sbindir}/init ${D}${base_sbindir}/init.${PN} + mv ${D}${base_bindir}/pidof ${D}${base_bindir}/pidof.${PN} + mv ${D}${base_sbindir}/halt ${D}${base_sbindir}/halt.${PN} + mv ${D}${base_sbindir}/reboot ${D}${base_sbindir}/reboot.${PN} + mv ${D}${base_sbindir}/shutdown ${D}${base_sbindir}/shutdown.${PN} + mv ${D}${bindir}/last ${D}${bindir}/last.${PN} + mv ${D}${bindir}/mesg ${D}${bindir}/mesg.${PN} + mv ${D}${bindir}/wall ${D}${bindir}/wall.${PN} +} + +pkg_postinst_${PN} () { + update-alternatives --install ${base_sbindir}/halt halt halt.${PN} 200 + update-alternatives --install ${base_sbindir}/reboot reboot reboot.${PN} 200 + update-alternatives --install ${base_sbindir}/shutdown shutdown shutdown.${PN} 200 + update-alternatives --install ${bindir}/last last last.${PN} 200 + update-alternatives --install ${bindir}/mesg mesg mesg.${PN} 200 + update-alternatives --install ${bindir}/wall wall wall.${PN} 200 +} + +pkg_prerm_${PN} () { + update-alternatives --remove halt halt.${PN} + update-alternatives --remove reboot reboot.${PN} + update-alternatives --remove shutdown shutdown.${PN} + update-alternatives --remove last last.${PN} + update-alternatives --remove mesg mesg.${PN} + update-alternatives --remove wall wall.${PN} +} + +pkg_postinst_sysvinit-pidof () { + update-alternatives --install ${base_bindir}/pidof pidof pidof.${PN} 200 +} + +pkg_prerm_sysvinit-pidof () { + update-alternatives --remove pidof pidof.${PN} } diff --git a/packages/tar/tar_1.13.93.bb b/packages/tar/tar_1.13.93.bb index 19600c6810..971bc56b53 100644 --- a/packages/tar/tar_1.13.93.bb +++ b/packages/tar/tar_1.13.93.bb @@ -3,9 +3,27 @@ DESCRIPTION = "GNU tar saves many files together into a single tape \ or disk archive, and can restore individual files from the archive." LICENSE = "GPL" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" +PR = "r1" SRC_URI = "ftp://alpha.gnu.org/gnu/tar/tar-${PV}.tar.gz \ file://configure.patch;patch=1 \ file://m4.patch;patch=1" inherit autotools + +do_install () { + autotools_do_install + install -d ${D}${base_bindir} + mv ${D}${bindir}/tar ${D}${base_bindir}/tar.${PN} + mv ${D}${libexecdir}/rmt ${D}${libexecdir}/rmt.${PN} +} + +pkg_postinst_${PN} () { + update-alternatives --install ${base_bindir}/tar tar tar.${PN} 100 + update-alternatives --install ${libexecdir}/rmt rmt rmt.${PN} 100 +} + +pkg_prerm_${PN} () { + update-alternatives --remove tar tar.${PN} + update-alternatives --remove rmt rmt.${PN} +} diff --git a/packages/util-linux/util-linux.inc b/packages/util-linux/util-linux.inc index 5d4ed8063a..505fcbe68e 100644 --- a/packages/util-linux/util-linux.inc +++ b/packages/util-linux/util-linux.inc @@ -14,7 +14,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/util-linux/util-linux-${PV}.tar. PACKAGES_prepend = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-readprofile " -FILES_util-linux-fdisk = "/sbin/fdisk" +FILES_util-linux-fdisk = "/sbin/fdisk.${PN}" FILES_util-linux-cfdisk = "/sbin/cfdisk" FILES_util-linux-sfdisk = "/sbin/sfdisk" FILES_util-linux-readprofile = "/usr/sbin/readprofile" @@ -39,4 +39,82 @@ do_install () { oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= \ 'OPT=${CFLAGS}' 'CC=${CC}' 'LD=${LD}' \ 'LDFLAGS=${LDFLAGS}' 'DESTDIR=${D}' install + + mv ${D}${base_bindir}/dmesg ${D}${base_bindir}/dmesg.${PN} + mv ${D}${base_bindir}/kill ${D}${base_bindir}/kill.${PN} + mv ${D}${base_bindir}/more ${D}${base_bindir}/more.${PN} + mv ${D}${base_sbindir}/halt ${D}${base_sbindir}/halt.${PN} + mv ${D}${base_sbindir}/hwclock ${D}${base_sbindir}/hwclock.${PN} + mv ${D}${base_sbindir}/losetup ${D}${base_sbindir}/losetup.${PN} + mv ${D}${base_sbindir}/mkswap ${D}${base_sbindir}/mkswap.${PN} + mv ${D}${base_sbindir}/pivot_root ${D}${base_sbindir}/pivot_root.${PN} + mv ${D}${base_sbindir}/reboot ${D}${base_sbindir}/reboot.${PN} + mv ${D}${base_sbindir}/shutdown ${D}${base_sbindir}/shutdown.${PN} + mv ${D}${base_sbindir}/sln ${D}${base_sbindir}/sln.${PN} + mv ${D}${base_sbindir}/swapoff ${D}${base_sbindir}/swapoff.${PN} + mv ${D}${base_sbindir}/swapon ${D}${base_sbindir}/swapon.${PN} + mv ${D}${bindir}/hexdump ${D}${bindir}/hexdump.${PN} + mv ${D}${bindir}/last ${D}${bindir}/last.${PN} + mv ${D}${bindir}/logger ${D}${bindir}/logger.${PN} + mv ${D}${bindir}/mesg ${D}${bindir}/mesg.${PN} + mv ${D}${bindir}/renice ${D}${bindir}/renice.${PN} + mv ${D}${bindir}/wall ${D}${bindir}/wall.${PN} + + mv ${D}${base_sbindir}/fdisk ${D}${base_sbindir}/fdisk.${PN} +} + +pkg_postinst_${PN} () { + update-alternatives --install ${base_bindir}/dmesg dmesg dmesg.${PN} 100 + update-alternatives --install ${base_bindir}/kill kill kill.${PN} 100 + update-alternatives --install ${base_bindir}/more more more.${PN} 100 + update-alternatives --install ${base_sbindir}/hwclock hwclock hwclock.${PN} 100 + update-alternatives --install ${base_sbindir}/losetup losetup losetup.${PN} 100 + update-alternatives --install ${base_sbindir}/mkswap mkswap mkswap.${PN} 100 + update-alternatives --install ${base_sbindir}/pivot_root pivot_root pivot_root.${PN} 100 + update-alternatives --install ${base_sbindir}/sln sln sln.${PN} 100 + update-alternatives --install ${base_sbindir}/swapoff swapoff swapoff.${PN} 100 + update-alternatives --install ${base_sbindir}/swapon swapon swapon.${PN} 100 + update-alternatives --install ${bindir}/hexdump hexdump hexdump.${PN} 100 + update-alternatives --install ${bindir}/last last last.${PN} 100 + update-alternatives --install ${bindir}/logger logger logger.${PN} 100 + update-alternatives --install ${bindir}/mesg mesg mesg.${PN} 100 + update-alternatives --install ${bindir}/renice renice renice.${PN} 100 + update-alternatives --install ${bindir}/wall wall wall.${PN} 100 + + # There seems to be problem, atleast on nslu2, with these, untill they are + # fixed the busybox ones have higher priority + update-alternatives --install ${base_sbindir}/shutdown shutdown shutdown.${PN} 10 + update-alternatives --install ${base_sbindir}/reboot reboot reboot.${PN} 10 + update-alternatives --install ${base_sbindir}/halt halt halt.${PN} 10 +} + +pkg_prerm_${PN} () { + update-alternatives --remove dmesg dmesg.${PN} + update-alternatives --remove kill kill.${PN} + update-alternatives --remove more more.${PN} + update-alternatives --remove halt halt.${PN} + update-alternatives --remove hwclock hwclock.${PN} + update-alternatives --remove losetup losetup.${PN} + update-alternatives --remove mkswap mkswap.${PN} + update-alternatives --remove pivot_root pivot_root.${PN} + update-alternatives --remove reboot reboot.${PN} + update-alternatives --remove shutdown shutdown.${PN} + update-alternatives --remove sln sln.${PN} + update-alternatives --remove swapoff swapoff.${PN} + update-alternatives --remove swapon swapon.${PN} + update-alternatives --remove hexdump hexdump.${PN} + update-alternatives --remove last last.${PN} + update-alternatives --remove logger logger.${PN} + update-alternatives --remove mesg mesg.${PN} + update-alternatives --remove renice renice.${PN} + update-alternatives --remove wall wall.${PN} } + +pkg_postinst_util-linux-fdisk () { + update-alternatives --install ${base_sbindir}/fdisk fdisk fdisk.${PN} 100 +} + +pkg_prerm_util-linux-fdisk () { + update-alternatives --remove fdisk fdisk.${PN} +} + diff --git a/packages/util-linux/util-linux_2.12q.bb b/packages/util-linux/util-linux_2.12q.bb index 5657aa1c57..26914c4c48 100644 --- a/packages/util-linux/util-linux_2.12q.bb +++ b/packages/util-linux/util-linux_2.12q.bb @@ -1 +1,3 @@ include util-linux.inc + +PR = "r1" diff --git a/packages/vlan/vlan_1.8.bb b/packages/vlan/vlan_1.8.bb index 01ae798240..44cc9fa06f 100644 --- a/packages/vlan/vlan_1.8.bb +++ b/packages/vlan/vlan_1.8.bb @@ -1,7 +1,7 @@ DESCRIPTION = "802.1q vlan support program" RRECOMMENDS = "kernel-module-8021q" MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>" -PR = "r1" +PR = "r2" S = "${WORKDIR}/vlan/" @@ -10,6 +10,15 @@ SRC_URI = "http://scry.wanfear.com/~greear/vlan/vlan.1.8.tar.gz \ inherit base +CCFLAGS = "-g -D_GNU_SOURCE -Wall -I${STAGING_INCDIR}" +LDLIBS = "" + +do_compile() { + ${CC} ${CCFLAGS} -c vconfig.c + ${CC} ${CCFLAGS} ${LDFLAGS} -o vconfig vconfig.o ${LDLIBS} + ${STRIP} vconfig +} + do_install() { install -d "${D}/usr/sbin" install -m 755 "${S}/vconfig" "${D}/usr/sbin/vconfig" diff --git a/packages/wget/wget_1.9.1.bb b/packages/wget/wget_1.9.1.bb index 16ccb6f151..ee95220244 100644 --- a/packages/wget/wget_1.9.1.bb +++ b/packages/wget/wget_1.9.1.bb @@ -19,3 +19,16 @@ do_configure () { rm -f libtool.m4 autotools_do_configure } + +do_install () { + autotools_do_install + mv ${D}${bindir}/wget ${D}${bindir}/wget.${PN} +} + +pkg_postinst_${PN} () { + update-alternatives --install ${bindir}/wget wget wget.${PN} 100 +} + +pkg_prerm_${PN} () { + update-alternatives --remove wget wget.${PN} +} |