diff options
| -rw-r--r-- | conf/distro/openslug-packages.conf | 4 | ||||
| -rw-r--r-- | packages/coreutils/coreutils_5.1.3.bb | 10 | ||||
| -rw-r--r-- | packages/linux/openslug-kernel-2.6.12.2/defconfig | 26 | ||||
| -rw-r--r-- | packages/meta/openslug-packages.bb | 1 |
4 files changed, 35 insertions, 6 deletions
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf index b2505744ab..da81ad9edb 100644 --- a/conf/distro/openslug-packages.conf +++ b/conf/distro/openslug-packages.conf @@ -49,6 +49,7 @@ ${PKGDIR}/packages/initscripts/*.bb \ ${PKGDIR}/packages/install/*.bb \ ${PKGDIR}/packages/ipkg-utils/*.bb \ ${PKGDIR}/packages/ipkg/*.bb \ +${PKGDIR}/packages/ircp/*.bb \ ${PKGDIR}/packages/ixp425-eth/*.bb \ ${PKGDIR}/packages/ixp4xx/*.bb \ ${PKGDIR}/packages/jpeg/*.bb \ @@ -96,6 +97,9 @@ ${PKGDIR}/packages/nfs-utils/*.bb \ ${PKGDIR}/packages/nis/*.bb \ ${PKGDIR}/packages/nslu2-binary-only/*.bb \ ${PKGDIR}/packages/ntp/*.bb \ +${PKGDIR}/packages/obexftp/*.bb \ +${PKGDIR}/packages/openobex/*.bb \ +${PKGDIR}/packages/openobex-apps/*.bb \ ${PKGDIR}/packages/openldap/*.bb \ ${PKGDIR}/packages/openntpd/*.bb \ ${PKGDIR}/packages/openslug-init/*.bb \ diff --git a/packages/coreutils/coreutils_5.1.3.bb b/packages/coreutils/coreutils_5.1.3.bb index 0d7a783663..cced8b00e7 100644 --- a/packages/coreutils/coreutils_5.1.3.bb +++ b/packages/coreutils/coreutils_5.1.3.bb @@ -3,7 +3,7 @@ SECTION = "base" DESCRIPTION = "A collection of core GNU utilities." RREPLACES = "textutils shellutils fileutils" RPROVIDES = "textutils shellutils fileutils" -PR = "r3" +PR = "r4" SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \ file://install-cross.patch;patch=1;pnum=0 \ @@ -11,6 +11,7 @@ SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \ inherit autotools +# [ gets a special treatment and is not included in this bindir_progs = "basename cksum comm csplit cut dir dircolors dirname du \ env expand expr factor fmt fold groups head hostid id install \ join link logname md5sum mkfifo nice nl nohup od paste pathchk \ @@ -19,7 +20,8 @@ bindir_progs = "basename cksum comm csplit cut dir dircolors dirname du \ unlink uptime users vdir wc who whoami yes \ " -base_bindir_progs = "cat chgrp chmod chown cp date dd echo false hostname kill \ +# hostname gets a special treatment and is not included in this +base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill \ ln ls mkdir mknod mv pwd rm rmdir sleep stty sync touch \ true uname \ " @@ -39,6 +41,7 @@ do_install () { # 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 + mv ${D}${bindir}/hostname ${D}${base_bindir}/hostname.${PN} # Renaming and moving the utilities that should go in /usr/sbin (FHS) install -d ${D}${sbindir} @@ -52,6 +55,8 @@ pkg_postinst_${PN} () { # The utilities in /bin for i in ${base_bindir_progs}; do update-alternatives --install ${base_bindir}/$i $i $i.${PN} 100; done + # coreutils hostname is retarded and doesn't know about -F, put at priority 10 + update-alternatives --install ${base_bindir}/hostname hostname hostname.${PN} 10 # The utilities in /usr/sbin for i in ${sbindir_progs}; do update-alternatives --install ${sbindir}/$i $i $i.${PN} 100; done @@ -64,6 +69,7 @@ pkg_prerm_${PN} () { # The utilities in /bin for i in ${base_bindir_progs}; do update-alternatives --remove $i $i.${PN}; done + update-alternatives --remove hostname hostname.${PN} # The utilities in /usr/sbin for i in ${sbindir_progs}; do update-alternatives --remove $i $i.${PN}; done diff --git a/packages/linux/openslug-kernel-2.6.12.2/defconfig b/packages/linux/openslug-kernel-2.6.12.2/defconfig index 3eba8afc45..eb5be45af5 100644 --- a/packages/linux/openslug-kernel-2.6.12.2/defconfig +++ b/packages/linux/openslug-kernel-2.6.12.2/defconfig @@ -151,7 +151,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc reboot=s console=ttyS0,115200n8" +CONFIG_CMDLINE="root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc reboot=s noirqdebug console=ttyS0,115200n8" # CONFIG_XIP_KERNEL is not set # @@ -426,8 +426,14 @@ CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m CONFIG_INET_TUNNEL=m CONFIG_IP_TCPDIAG=m -# CONFIG_IP_TCPDIAG_IPV6 is not set -# CONFIG_IPV6 is not set +CONFIG_IP_TCPDIAG_IPV6=y +CONFIG_IPV6=m +# CONFIG_IPV6_PRIVACY is not set +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_INET6_TUNNEL=m +CONFIG_IPV6_TUNNEL=m # CONFIG_NETFILTER is not set CONFIG_XFRM=y # CONFIG_XFRM_USER is not set @@ -829,7 +835,17 @@ CONFIG_VIDEO_DEV=m # # Sound # -# CONFIG_SOUND is not set +CONFIG_SOUND=m + +# +# Advanced Linux Sound Architecture +# +# CONFIG_SND is not set + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set # # USB support @@ -862,10 +878,12 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y # # USB Device Class drivers # +CONFIG_USB_AUDIO=m # # USB Bluetooth TTY can only be used with disabled Bluetooth subsystem # +# CONFIG_USB_MIDI is not set CONFIG_USB_ACM=m CONFIG_USB_PRINTER=m diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index b0d852e188..8f804abc19 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -70,6 +70,7 @@ OPENSLUG_PACKAGES = "\ mysql \ nail \ ncftp \ + obexftp openobex openobex-apps ircp \ openssh \ openvpn \ pcre \ |