diff options
134 files changed, 1260 insertions, 1224 deletions
diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 08c1058edf..d54d6c7b9e 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -61,7 +61,7 @@ def package_qa_get_machine_dict(): "avr32": (6317, 0, 0, False, True), }, "uclinux-uclibc" : { - "bfin": ( 0, 0, 0, True, True), + "bfin": ( 106, 0, 0, True, True), }, "linux-gnueabi" : { "arm" : (40, 0, 0, True, True), @@ -233,7 +233,7 @@ def package_qa_check_rpath(file,name,d): bb.error("QA Issue package %s contains bad RPATH %s in file %s" % (name, line, file)) #bb.note("Fixing RPATH for you in %s" % file) #os.popen("%s -r /lib %s" % (chrpath,file)) - return False + #return False return True def package_qa_check_devdbg(path, name,d): diff --git a/classes/nslu2-image.bbclass b/classes/nslu2-image.bbclass index 14bf989055..a06c1d1468 100644 --- a/classes/nslu2-image.bbclass +++ b/classes/nslu2-image.bbclass @@ -13,6 +13,9 @@ nslu2_pack_image () { slugimage -p -b RedBoot -s SysConf -k vmlinuz \ -r Ramdisk:1,Flashdisk:flashdisk.jffs2 -m NPE-B -t Trailer \ -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2.bin + slugimage -F -p -b RedBoot -s SysConf -k vmlinuz \ + -r Ramdisk:1,Flashdisk:flashdisk.jffs2 -m NPE-B -t Trailer \ + -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2-16mb.bin rm -rf ${DEPLOY_DIR_IMAGE}/slug } diff --git a/classes/openmoko2.bbclass b/classes/openmoko2.bbclass index 17b3bbafa6..872dd4915c 100644 --- a/classes/openmoko2.bbclass +++ b/classes/openmoko2.bbclass @@ -18,6 +18,7 @@ def openmoko_two_get_subdir(d): elif section == "panel-plugin": return "panel-plugins" elif section == "inputmethods": return "inputmethods" elif section == "daemons": return "daemons" + elif section == "misc": return "misc" else: return section LICENSE = "${@openmoko_two_get_license(d)}" @@ -30,4 +31,3 @@ FILES_${PN} += "${datadir}/icons" # SVNREV = "r${SRCREV}" SVNREV = "${SRCDATE}" - diff --git a/conf/bitbake.conf b/conf/bitbake.conf index dc3378fd95..d642998e8d 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -168,6 +168,7 @@ STAGING_BINDIR = "${STAGING_DIR}/${HOST_SYS}/bin" STAGING_BINDIR_CROSS = "${STAGING_DIR}/${BUILD_SYS}/bin/${HOST_SYS}" STAGING_BINDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/bin" STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib" +STAGING_LIBDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/lib" STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include" STAGING_DATADIR = "${STAGING_DIR}/${HOST_SYS}/share" STAGING_LOADER_DIR = "${STAGING_DIR}/${HOST_SYS}/loader" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 00b9440b1f..acfe23d742 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -16,7 +16,7 @@ #TARGET_OS "linux" or "linux-uclibc" # The following may be overridden to make sub-versions -SLUGOS_VERSION = "4.5" +SLUGOS_VERSION = "4.6" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): @@ -145,3 +145,5 @@ IGNORE_STRIP_ERRORS = "" #PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225" PREFERRED_VERSION_linux-libc-headers = "2.6.18" + +PREFERRED_VERSION_openssh ?= "4.6p1" diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf index 063a68481a..b1e7082fd7 100644 --- a/conf/machine/compulab-pxa270.conf +++ b/conf/machine/compulab-pxa270.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for Compulab PXA270 system #OLDEST_KERNEL = "2.6.16" TARGET_ARCH = "arm" -PREFERRED_VERSION_compulab-pxa270 = "2.6.16" +PREFERRED_VERSION_compulab-pxa270 = "2.6.22" GUI_MACHINE_CLASS ?= "bigscreen" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}" diff --git a/packages/abiword/abiword-plugins_2.5.1.bb b/packages/abiword/abiword-plugins_2.5.1.bb new file mode 100644 index 0000000000..10b7ba2de7 --- /dev/null +++ b/packages/abiword/abiword-plugins_2.5.1.bb @@ -0,0 +1,38 @@ +DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"" +HOMEPAGE = "http://www.abiword.org" +SECTION = "x11/office" +LICENSE = "GPLv2" +DEPENDS = "libwpd librsvg goffice poppler libglade" +RDEPENDS = "abiword" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz \ + http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \ + " + +inherit autotools + +PARALLEL_MAKE="" + +EXTRA_OECONF = " --without-libwmf \ + --without-inter7eps \ + --with-abiword=${WORKDIR}/abiword-${PV} \ + " + +PACKAGES_DYNAMIC = "abiword-plugin-*" + +python populate_packages_prepend () { + abiword_libdir = bb.data.expand('${libdir}/abiword-2.5/plugins', d) + do_split_packages(d, abiword_libdir, '^libAbi(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='') + do_split_packages(d, abiword_libdir, '^libAbi(.*)\.la$', 'abiword-plugin-%s-dev', 'Abiword plugin for %s', extra_depends='') +} + + +PACKAGES =+ "abiword-plugin-collab-glade" + +FILES_abiword-plugin-collab-glade += "${datadir}" +RDEPENDS_abiword-plugin-collab-glade = "abiword-plugin-collab" + +FILES_${PN}-dbg += "${libdir}/abiword-2.5/plugins/.debug" + diff --git a/packages/angstrom/angstrom-x11-base-depends.bb b/packages/angstrom/angstrom-x11-base-depends.bb index 2eb3a36804..a2eda707f1 100644 --- a/packages/angstrom/angstrom-x11-base-depends.bb +++ b/packages/angstrom/angstrom-x11-base-depends.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r34" +PR = "r35" ALLOW_EMPTY = "1" XSERVER ?= "xserver-kdrive-fbdev" diff --git a/packages/asterisk/asterisk-1.4.7/.mtn2git_empty b/packages/asterisk/asterisk-1.4.10/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/asterisk/asterisk-1.4.7/.mtn2git_empty +++ b/packages/asterisk/asterisk-1.4.10/.mtn2git_empty diff --git a/packages/asterisk/asterisk-1.4.7/Makefile.patch b/packages/asterisk/asterisk-1.4.10/Makefile.patch index a6d630949e..a6d630949e 100644 --- a/packages/asterisk/asterisk-1.4.7/Makefile.patch +++ b/packages/asterisk/asterisk-1.4.10/Makefile.patch diff --git a/packages/asterisk/asterisk-1.4.7/init b/packages/asterisk/asterisk-1.4.10/init index f26ad38db3..f26ad38db3 100644 --- a/packages/asterisk/asterisk-1.4.7/init +++ b/packages/asterisk/asterisk-1.4.10/init diff --git a/packages/asterisk/asterisk-1.4.7/logrotate b/packages/asterisk/asterisk-1.4.10/logrotate index dfd25ee55c..dfd25ee55c 100644 --- a/packages/asterisk/asterisk-1.4.7/logrotate +++ b/packages/asterisk/asterisk-1.4.10/logrotate diff --git a/packages/asterisk/asterisk-1.4.7/sounds.xml.patch b/packages/asterisk/asterisk-1.4.10/sounds.xml.patch index b549fea132..b549fea132 100644 --- a/packages/asterisk/asterisk-1.4.7/sounds.xml.patch +++ b/packages/asterisk/asterisk-1.4.10/sounds.xml.patch diff --git a/packages/asterisk/asterisk-1.4.7/volatiles b/packages/asterisk/asterisk-1.4.10/volatiles index c68e786c90..c68e786c90 100644 --- a/packages/asterisk/asterisk-1.4.7/volatiles +++ b/packages/asterisk/asterisk-1.4.10/volatiles diff --git a/packages/asterisk/asterisk_1.4.7.bb b/packages/asterisk/asterisk_1.4.10.bb index 3973ff41dd..4110f01930 100644 --- a/packages/asterisk/asterisk_1.4.7.bb +++ b/packages/asterisk/asterisk_1.4.10.bb @@ -3,8 +3,10 @@ HOMEPAGE = "http://www.asterisk.org" SECTION = "voip" LICENSE = "GPLv2" PRIORITY = "optional" -DEPENDS = "ncurses readline zlib openssl curl popt gnutls sqlite libogg libvorbis" +SECTION = "console/telephony" +DEPENDS = "speex readline zlib openssl curl popt gnutls sqlite libogg libvorbis" RRECOMMENDS_${PN} = "logrotate" +PR = "r1" DEFAULT_PREFERENCE = "-1" @@ -15,23 +17,30 @@ SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz\ file://volatiles \ file://init" +ARCH_efika="ppc" +ARCH_dht-walnut="ppc" +ARCH_magicbox="ppc" +ARCH_sequoia="ppc" + + + INITSCRIPT_NAME = "asterisk" INITSCRIPT_PARAMS = "defaults 60" inherit autotools update-rc.d -EXTRA_OECONF = "--with-ssl=${STAGING_DIR}/${HOST_SYS}\ - --with-z=${STAGING_DIR}/${HOST_SYS}\ - --with-curl=${STAGING_DIR}/${HOST_SYS}\ - --with-termcap=${STAGING_DIR}/${HOST_SYS}\ - --with-ogg=${STAGING_DIR}/${HOST_SYS}\ - --with-vorbis=${STAGING_DIR}/${HOST_SYS}\ - --with-sqlite=${STAGING_DIR}/${HOST_SYS}\ - --with-popt=${STAGING_DIR}/${HOST_SYS}\ - --with-gnutls=${STAGING_DIR}/${HOST_SYS}\ +EXTRA_OECONF = "--with-ssl=${STAGING_DIR}/${TARGET_SYS}\ + --with-z=${STAGING_DIR}/${TARGET_SYS}\ + --with-curl=${STAGING_DIR}/${TARGET_SYS}\ + --with-termcap=${STAGING_DIR}/${TARGET_SYS}\ + --with-ogg=${STAGING_DIR}/${TARGET_SYS}\ + --with-vorbis=${STAGING_DIR}/${TARGET_SYS}\ + --with-sqlite=${STAGING_DIR}/${TARGET_SYS}\ + --with-popt=${STAGING_DIR}/${TARGET_SYS}\ + --with-gnutls=${STAGING_DIR}/${TARGET_SYS}\ --without-curses\ - --with-ncurses=${STAGING_DIR}/${HOST_SYS}\ + --with-ncurses=${STAGING_DIR}/${TARGET_SYS}\ --without-imap\ --without-netsnmp\ --without-odbc\ @@ -47,7 +56,8 @@ EXTRA_OECONF = "--with-ssl=${STAGING_DIR}/${HOST_SYS}\ #export NOISY_BUILD=yes export ASTCFLAGS = "-fsigned-char -I${STAGING_INCDIR} -DPATH_MAX=4096" -export ASTLDFLAGS="${LDFLAGS}" +export ASTLDFLAGS="${LDFLAGS} -lpthread -ldl -lresolv " +export PROC="${ARCH}" do_configure_prepend () { sed -i 's:/var:${localstatedir}:' ${WORKDIR}/logrotate @@ -63,7 +73,24 @@ do_configure () { oe_runconf } + +do_compile() { + ( + #make sure that menuselect gets build using host toolchain + unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS + cd menuselect + ./configure + oe_runmake + cd ../ + ) || exit 1 + oe_runmake +} + + + + do_install_append() { + install -d ${D}${sysconfdir}/init.d/ install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/asterisk install -c -D -m 644 ${WORKDIR}/logrotate ${D}${sysconfdir}/logrotate.d/asterisk install -c -D -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/asterisk @@ -76,6 +103,8 @@ pkg_postinst_prepend() { } FILES_${PN} += "${libdir}/asterisk/modules/*" +FILES_${PN}-dbg += "${libdir}/asterisk/modules/.debug \ + ${localstatedir}/lib/asterisk/*/.debug" CONFFILES_${PN} += "${sysconfdir}/asterisk/adsi.conf" CONFFILES_${PN} += "${sysconfdir}/asterisk/adtranvofr.conf" @@ -139,4 +168,4 @@ CONFFILES_${PN} += "${sysconfdir}/asterisk/users.conf" CONFFILES_${PN} += "${sysconfdir}/asterisk/voicemail.conf" CONFFILES_${PN} += "${sysconfdir}/asterisk/vpb.conf" CONFFILES_${PN} += "${sysconfdir}/asterisk/zapata.conf" - +CONFFILES_${PN} += "${sysconfdir}/logrotate.d/asterisk" diff --git a/packages/base-files/base-files/akita/fstab b/packages/base-files/base-files/akita/fstab index ba53cd6fd4..8a2b07a089 100644 --- a/packages/base-files/base-files/akita/fstab +++ b/packages/base-files/base-files/akita/fstab @@ -5,6 +5,7 @@ proc /proc proc defaults 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 # SD/MMC in kernel 2.4 /dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 diff --git a/packages/base-files/base-files/amsdelta/fstab b/packages/base-files/base-files/amsdelta/fstab index 0285a1f7e7..45922b2a9c 100644 --- a/packages/base-files/base-files/amsdelta/fstab +++ b/packages/base-files/base-files/amsdelta/fstab @@ -1,6 +1,8 @@ /dev/mtdblock4 / jffs2 defaults 1 1 proc /proc proc defaults 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 + # we use a non-volatile ramdisk, see /etc/init.d/ramdisk tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/armzone-qt2410/fstab b/packages/base-files/base-files/armzone-qt2410/fstab index 88d057c40d..9aedcbe0f0 100644 --- a/packages/base-files/base-files/armzone-qt2410/fstab +++ b/packages/base-files/base-files/armzone-qt2410/fstab @@ -8,6 +8,7 @@ proc /proc proc defaults 0 0 # Temporary tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 # SD/MMC /dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 diff --git a/packages/base-files/base-files/c7x0/fstab b/packages/base-files/base-files/c7x0/fstab index 03945ca81b..c3de8d28dc 100644 --- a/packages/base-files/base-files/c7x0/fstab +++ b/packages/base-files/base-files/c7x0/fstab @@ -5,6 +5,7 @@ proc /proc proc defaults 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 # SD/MMC in kernel 2.4 /dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 diff --git a/packages/base-files/base-files/collie/fstab b/packages/base-files/base-files/collie/fstab index cbb38d1831..a3a9ea2df1 100644 --- a/packages/base-files/base-files/collie/fstab +++ b/packages/base-files/base-files/collie/fstab @@ -3,6 +3,7 @@ proc /proc proc defaults 0 0 /dev/hda1 /media/cf auto defaults,sync,noauto,noatime,user,exec,suid,gid=100,umask=0002 0 0 /dev/mmcda1 /media/card auto defaults,sync,noauto,noatime,user,exec,suid 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 # we use a non-volatile ramdisk, see /etc/init.d/ramdisk #tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/efika/fstab b/packages/base-files/base-files/efika/fstab index 8c79a60df9..c7bf023f22 100644 --- a/packages/base-files/base-files/efika/fstab +++ b/packages/base-files/base-files/efika/fstab @@ -2,4 +2,5 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 usbfs /proc/bus/usb usbfs auto 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 diff --git a/packages/base-files/base-files/ep93xx/fstab b/packages/base-files/base-files/ep93xx/fstab index 8c79a60df9..c7bf023f22 100644 --- a/packages/base-files/base-files/ep93xx/fstab +++ b/packages/base-files/base-files/ep93xx/fstab @@ -2,4 +2,5 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 usbfs /proc/bus/usb usbfs auto 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 diff --git a/packages/base-files/base-files/epia/fstab b/packages/base-files/base-files/epia/fstab index 83d673c8b5..5ec79ba17a 100644 --- a/packages/base-files/base-files/epia/fstab +++ b/packages/base-files/base-files/epia/fstab @@ -1,4 +1,5 @@ /dev/ram0 / ext2 rw 1 1 tmpfs /var/volatile tmpfs mode=0755 0 0 proc /proc proc defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 tmpfs /tmp tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/fic-gta01/fstab b/packages/base-files/base-files/fic-gta01/fstab index 2f4a38e703..d2976a4205 100644 --- a/packages/base-files/base-files/fic-gta01/fstab +++ b/packages/base-files/base-files/fic-gta01/fstab @@ -8,6 +8,7 @@ proc /proc proc defaults 0 0 # Temporary tmpfs /tmp tmpfs defaults 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 tmpfs /media/ram tmpfs defaults 0 0 # microSD slot diff --git a/packages/base-files/base-files/fic-gta02/.mtn2git_empty b/packages/base-files/base-files/fic-gta02/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/base-files/base-files/fic-gta02/.mtn2git_empty diff --git a/packages/base-files/base-files/fic-gta02/fstab b/packages/base-files/base-files/fic-gta02/fstab new file mode 100644 index 0000000000..d2976a4205 --- /dev/null +++ b/packages/base-files/base-files/fic-gta02/fstab @@ -0,0 +1,18 @@ +# Root and Pseudo +/dev/mtdblock4 / jffs2 rw,noatime 1 1 +proc /proc proc defaults 0 0 + +# devpts? +# usb? + +# Temporary +tmpfs /tmp tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 +tmpfs /media/ram tmpfs defaults 0 0 + +# microSD slot +/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 + +# USB Storage +/dev/sda1 /media/hdd vfat noauto,umask=000,noatime,iocharset=utf8,codepage=932 0 0 diff --git a/packages/base-files/base-files/fstab b/packages/base-files/base-files/fstab index 0720daf432..628a9e9876 100644 --- a/packages/base-files/base-files/fstab +++ b/packages/base-files/base-files/fstab @@ -5,6 +5,7 @@ proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 usbfs /proc/bus/usb usbfs defaults 0 0 tmpfs /var/volatile tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 tmpfs /media/ram tmpfs defaults 0 0 # uncomment this if your device has a SD/MMC/Transflash slot diff --git a/packages/base-files/base-files/h2200/fstab b/packages/base-files/base-files/h2200/fstab index 6b008b3834..8243195d99 100644 --- a/packages/base-files/base-files/h2200/fstab +++ b/packages/base-files/base-files/h2200/fstab @@ -2,5 +2,6 @@ proc /proc proc defaults 0 0 sys /sys sysfs defaults 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 /dev/hda1 /media/cf auto defaults,sync,noauto,noatime,exec,suid 0 0 /dev/mmcblk0p1 /media/card auto defaults,sync,noauto,noatime,exec,suid 0 0 diff --git a/packages/base-files/base-files/h3600/fstab b/packages/base-files/base-files/h3600/fstab index d300b02566..92293a59af 100644 --- a/packages/base-files/base-files/h3600/fstab +++ b/packages/base-files/base-files/h3600/fstab @@ -3,4 +3,5 @@ proc /proc proc defaults 0 0 /dev/hda1 /media/cf auto defaults,noauto,noatime,user,exec,suid 0 0 /dev/mmc/part1 /media/card auto defaults,noauto,noatime,user,exec,suid 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/h3900/fstab b/packages/base-files/base-files/h3900/fstab index afa028bf90..2a106ef945 100644 --- a/packages/base-files/base-files/h3900/fstab +++ b/packages/base-files/base-files/h3900/fstab @@ -5,4 +5,5 @@ proc /proc proc defaults 0 0 /dev/hda1 /media/cf auto defaults,noauto,noatime,user,exec,suid 0 0 /dev/mmc/part1 /media/card auto defaults,noauto,noatime,user,exec,suid 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/h5000/fstab b/packages/base-files/base-files/h5000/fstab index 4ae3ad1344..4d3c38eca8 100644 --- a/packages/base-files/base-files/h5000/fstab +++ b/packages/base-files/base-files/h5000/fstab @@ -5,4 +5,5 @@ proc /proc proc defaults 0 0 /dev/hda1 /media/cf auto defaults,noauto,noatime,user,exec,suid 0 0 /dev/mmcblk0p1 /media/card auto defaults,noauto,noatime,user,exec,suid 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/h6300/fstab b/packages/base-files/base-files/h6300/fstab index f2eeb25b36..f9b94d1960 100644 --- a/packages/base-files/base-files/h6300/fstab +++ b/packages/base-files/base-files/h6300/fstab @@ -2,6 +2,7 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 sys /sys sysfs defaults 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 #The devpts file system provides an interface to pseudo terminal (pty) devices. devpts /dev/pts devpts mode=0620,gid=5 0 0 #Mount first partition from the mmc card. diff --git a/packages/base-files/base-files/htcuniversal/fstab b/packages/base-files/base-files/htcuniversal/fstab index 1ec129e366..b4aa259c4e 100644 --- a/packages/base-files/base-files/htcuniversal/fstab +++ b/packages/base-files/base-files/htcuniversal/fstab @@ -4,6 +4,7 @@ devpts /dev/pts devpts mode=0620,gid=5 0 0 usbfs /proc/bus/usb usbfs defaults 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 # uncomment this if your device has a SD/MMC/Transflash slot /dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 diff --git a/packages/base-files/base-files/hx4700/fstab b/packages/base-files/base-files/hx4700/fstab index 1c90d577ac..04ac4849fd 100644 --- a/packages/base-files/base-files/hx4700/fstab +++ b/packages/base-files/base-files/hx4700/fstab @@ -6,4 +6,5 @@ sys /sys sysfs defaults 0 0 /dev/hda1 /media/cf auto defaults,noauto,noatime,exec,suid 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/jornada56x/fstab b/packages/base-files/base-files/jornada56x/fstab index 65db0c94a3..d8258a0c05 100644 --- a/packages/base-files/base-files/jornada56x/fstab +++ b/packages/base-files/base-files/jornada56x/fstab @@ -3,4 +3,5 @@ proc /proc proc defaults 0 0 /dev/hda1 /mnt/cf auto defaults,sync,noauto 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /mnt/ram tmpfs defaults 0 0 -devpts /dev/pts devpts defaults 0 0
\ No newline at end of file +tmpfs /dev/shm tmpfs mode=0777 0 0 +devpts /dev/pts devpts defaults 0 0 diff --git a/packages/base-files/base-files/jornada6xx/fstab b/packages/base-files/base-files/jornada6xx/fstab index 22a3d30e71..f0c23d936c 100644 --- a/packages/base-files/base-files/jornada6xx/fstab +++ b/packages/base-files/base-files/jornada6xx/fstab @@ -4,4 +4,5 @@ proc /proc proc defaults 0 0 /dev/hda3 none swap sw 0 0 tmpfs /var/volatiles tmpfs defaults 0 0 tmpfs /mnt/ram tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 devpts /dev/pts devpts defaults 0 0 diff --git a/packages/base-files/base-files/jornada7xx/fstab b/packages/base-files/base-files/jornada7xx/fstab index 22a3d30e71..f0c23d936c 100644 --- a/packages/base-files/base-files/jornada7xx/fstab +++ b/packages/base-files/base-files/jornada7xx/fstab @@ -4,4 +4,5 @@ proc /proc proc defaults 0 0 /dev/hda3 none swap sw 0 0 tmpfs /var/volatiles tmpfs defaults 0 0 tmpfs /mnt/ram tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 devpts /dev/pts devpts defaults 0 0 diff --git a/packages/base-files/base-files/mtx-1/fstab b/packages/base-files/base-files/mtx-1/fstab index 06ba41dbb8..5c0e2b39d5 100644 --- a/packages/base-files/base-files/mtx-1/fstab +++ b/packages/base-files/base-files/mtx-1/fstab @@ -5,4 +5,5 @@ rootfs / auto defaults 1 1 tmpfs /var/volatile tmpfs mode=0755,size=10m 0 0 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 usbdevfs /proc/bus/usb usbdevfs noauto 0 0 diff --git a/packages/base-files/base-files/mtx-2/fstab b/packages/base-files/base-files/mtx-2/fstab index a8f96f81b0..8b9ad0f308 100644 --- a/packages/base-files/base-files/mtx-2/fstab +++ b/packages/base-files/base-files/mtx-2/fstab @@ -5,4 +5,5 @@ rootfs / auto defaults 1 1 tmpfs /var/volatile tmpfs mode=0755,size=10m 0 0 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 usbdevfs /proc/bus/usb usbdevfs noauto 0 0 diff --git a/packages/base-files/base-files/netbook-pro/fstab b/packages/base-files/base-files/netbook-pro/fstab index 8c79a60df9..c7bf023f22 100644 --- a/packages/base-files/base-files/netbook-pro/fstab +++ b/packages/base-files/base-files/netbook-pro/fstab @@ -2,4 +2,5 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 usbfs /proc/bus/usb usbfs auto 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 diff --git a/packages/base-files/base-files/netvista/fstab b/packages/base-files/base-files/netvista/fstab index f26a57d2cd..351041d66e 100644 --- a/packages/base-files/base-files/netvista/fstab +++ b/packages/base-files/base-files/netvista/fstab @@ -2,4 +2,5 @@ tmpfs /var/volatile tmpfs mode=0755 0 0 proc /proc proc defaults 0 0 tmpfs /tmp tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 devfs /dev/devfs devfs defaults 0 0 diff --git a/packages/base-files/base-files/nokia770/fstab b/packages/base-files/base-files/nokia770/fstab index c68c4d4b43..c09a851566 100644 --- a/packages/base-files/base-files/nokia770/fstab +++ b/packages/base-files/base-files/nokia770/fstab @@ -2,5 +2,6 @@ rootfs / rootfs defaults,errors=remount-ro,noatime 0 /dev/mmcblk0p1 /media/card auto defaults,noauto,noatime,exec,suid 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 proc /proc proc defaults 0 0 usbfs /proc/bus/usb usbfs defaults 0 0 diff --git a/packages/base-files/base-files/omap5912osk/fstab b/packages/base-files/base-files/omap5912osk/fstab index 988cf717b0..687fd00227 100644 --- a/packages/base-files/base-files/omap5912osk/fstab +++ b/packages/base-files/base-files/omap5912osk/fstab @@ -4,6 +4,7 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 sysfs /sysfs sysfs defaults 0 0 tmpfs /dev tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/openmn/fstab b/packages/base-files/base-files/openmn/fstab index c3629a4887..06589b01dc 100644 --- a/packages/base-files/base-files/openmn/fstab +++ b/packages/base-files/base-files/openmn/fstab @@ -1,4 +1,5 @@ devfs /dev devfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 proc /proc proc defaults 0 0 none /sys sysfs defaults 0 0 rootfs / rootfs rw 1 1 diff --git a/packages/base-files/base-files/poodle/fstab b/packages/base-files/base-files/poodle/fstab index 81de333ba7..9f87b91155 100644 --- a/packages/base-files/base-files/poodle/fstab +++ b/packages/base-files/base-files/poodle/fstab @@ -9,5 +9,6 @@ proc /proc proc defaults 0 0 # SD/MMC in kernel 2.4 /dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/simpad/fstab b/packages/base-files/base-files/simpad/fstab index c9f82ca2e8..3e57ae3534 100644 --- a/packages/base-files/base-files/simpad/fstab +++ b/packages/base-files/base-files/simpad/fstab @@ -1,6 +1,7 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 usbdevfs /proc/bus/usb usbdevfs noauto 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/slugos/fstab b/packages/base-files/base-files/slugos/fstab index 3f35e7a3a7..d30f958401 100644 --- a/packages/base-files/base-files/slugos/fstab +++ b/packages/base-files/base-files/slugos/fstab @@ -2,4 +2,5 @@ rootfs / jffs2 defaults 1 1 proc /proc proc defaults 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 usbfs /proc/bus/usb usbfs defaults 0 0 diff --git a/packages/base-files/base-files/spitz/fstab b/packages/base-files/base-files/spitz/fstab index 8e667b63a5..f266212135 100644 --- a/packages/base-files/base-files/spitz/fstab +++ b/packages/base-files/base-files/spitz/fstab @@ -6,6 +6,8 @@ proc /proc proc defaults 0 0 # we can use a normal var filesystem with a microdrive # tmpfs /var/volatiles tmpfs defaults 0 0 tmpfs /media/ram tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 + # Compact Flash memory cards /dev/hdc1 /media/cf auto defaults,sync,noauto 0 0 diff --git a/packages/base-files/base-files/tosa/fstab b/packages/base-files/base-files/tosa/fstab index b439abeb2c..8607c79be8 100644 --- a/packages/base-files/base-files/tosa/fstab +++ b/packages/base-files/base-files/tosa/fstab @@ -5,6 +5,7 @@ proc /proc proc defaults 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 usbfs /proc/bus/usb usbfs auto 0 0 diff --git a/packages/base-files/base-files/wrt54/fstab b/packages/base-files/base-files/wrt54/fstab index 3dce9b3ed1..0e64d3015e 100644 --- a/packages/base-files/base-files/wrt54/fstab +++ b/packages/base-files/base-files/wrt54/fstab @@ -3,5 +3,6 @@ # <file system> <mount pt> <type> <options> <dump> <pass> rootfs / auto defaults 1 1 tmpfs /var/volatile tmpfs mode=0755,size=50% 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 diff --git a/packages/base-files/base-files/xxs1500/fstab b/packages/base-files/base-files/xxs1500/fstab index d4e2eff592..655ea977b9 100644 --- a/packages/base-files/base-files/xxs1500/fstab +++ b/packages/base-files/base-files/xxs1500/fstab @@ -5,4 +5,5 @@ rootfs / auto defaults 1 1 tmpfs /var/volatile tmpfs mode=0755,size=10m 0 0 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 usbdevfs /proc/bus/usb usbdevfs noauto 0 0 diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index d8335f7abb..ac12f5e08a 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r69" +PR = "r71" LICENSE = "GPL" SRC_URI = " \ @@ -24,6 +24,8 @@ SRC_URI = " \ file://licenses/Artistic " S = "${WORKDIR}" +SRC_URI_OVERRIDES_PACKAGE_ARCH = "1" + docdir_append = "/${P}" dirs1777 = "/tmp ${localstatedir}/volatile/lock ${localstatedir}/volatile/tmp" dirs2775 = "/home ${prefix}/src ${localstatedir}/local" diff --git a/packages/binutils/binutils-cvs/110-arm-eabi-conf.patch b/packages/binutils/binutils-cvs/110-arm-eabi-conf.patch new file mode 100644 index 0000000000..ca586843f2 --- /dev/null +++ b/packages/binutils/binutils-cvs/110-arm-eabi-conf.patch @@ -0,0 +1,24 @@ +diff -urN binutils-2.16.91.0.7.orig/configure binutils-2.16.91.0.7/configure +--- binutils-2.16.91.0.7.orig/configure 2006-05-31 14:54:24.000000000 +0300 ++++ binutils-2.16.91.0.7/configure 2006-05-31 14:55:53.000000000 +0300 +@@ -1299,7 +1299,7 @@ + arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* ) + noconfigdirs="$noconfigdirs target-libffi target-qthreads" + ;; +- arm*-*-linux-gnueabi) ++ arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi) + noconfigdirs="$noconfigdirs target-libffi target-qthreads" + noconfigdirs="$noconfigdirs target-libjava target-libobjc" + ;; +diff -urN binutils-2.16.91.0.7.orig/configure.ac binutils-2.16.91.0.7/configure.ac +--- binutils-2.16.91.0.7.orig/configure.ac 2006-05-31 14:54:24.000000000 +0300 ++++ binutils-2.16.91.0.7/configure.ac 2006-05-31 14:55:53.000000000 +0300 +@@ -497,7 +497,7 @@ + arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* ) + noconfigdirs="$noconfigdirs target-libffi target-qthreads" + ;; +- arm*-*-linux-gnueabi) ++ arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi) + noconfigdirs="$noconfigdirs target-libffi target-qthreads" + noconfigdirs="$noconfigdirs target-libjava target-libobjc" + ;; diff --git a/packages/binutils/binutils-cvs/binutils-100_cflags_for_build.patch b/packages/binutils/binutils-cvs/binutils-100_cflags_for_build.patch deleted file mode 100644 index 468808bf59..0000000000 --- a/packages/binutils/binutils-cvs/binutils-100_cflags_for_build.patch +++ /dev/null @@ -1,91 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- src/bfd/doc/Makefile.am~binutils-100_cflags_for_build.patch -+++ src/bfd/doc/Makefile.am -@@ -55,10 +55,10 @@ - MKDOC = chew$(EXEEXT_FOR_BUILD) - - $(MKDOC): chew.o -- $(CC_FOR_BUILD) -o $(MKDOC) chew.o $(CFLAGS) $(LOADLIBES) $(LDFLAGS) -+ $(CC_FOR_BUILD) -o $(MKDOC) chew.o $(CFLAGS_FOR_BUILD) $(LOADLIBES) $(LDFLAGS_FOR_BUILD) - - chew.o: chew.c -- $(CC_FOR_BUILD) -c -I.. -I$(srcdir)/.. -I$(srcdir)/../../include -I$(srcdir)/../../intl -I../../intl $(H_CFLAGS) $(CFLAGS) $(srcdir)/chew.c -+ $(CC_FOR_BUILD) -c -I.. -I$(srcdir)/.. -I$(srcdir)/../../include -I$(srcdir)/../../intl -I../../intl $(H_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/chew.c - - protos: libbfd.h libcoff.h bfd.h - ---- src/binutils/Makefile.am~binutils-100_cflags_for_build.patch -+++ src/binutils/Makefile.am -@@ -219,20 +219,20 @@ - ./sysinfo$(EXEEXT_FOR_BUILD) -d <$(srcdir)/sysroff.info >sysroff.h - - sysinfo$(EXEEXT_FOR_BUILD): sysinfo.o syslex.o -- $(CC_FOR_BUILD) $(CFLAGS) $(LDFLAGS) -o $@ sysinfo.o syslex.o -+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ sysinfo.o syslex.o - - syslex.o: syslex.c sysinfo.h - if [ -r syslex.c ]; then \ -- $(CC_FOR_BUILD) -c -I. $(CFLAGS) syslex.c ; \ -+ $(CC_FOR_BUILD) -c -I. $(CFLAGS_FOR_BUILD) syslex.c ; \ - else \ -- $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(CFLAGS) $(srcdir)/syslex.c ;\ -+ $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(CFLAGS_FOR_BUILD) $(srcdir)/syslex.c ;\ - fi - - sysinfo.o: sysinfo.c - if [ -r sysinfo.c ]; then \ -- $(CC_FOR_BUILD) -c -I. $(CFLAGS) sysinfo.c ; \ -+ $(CC_FOR_BUILD) -c -I. $(CFLAGS_FOR_BUILD) sysinfo.c ; \ - else \ -- $(CC_FOR_BUILD) -c -I. $(CFLAGS) $(srcdir)/sysinfo.c ; \ -+ $(CC_FOR_BUILD) -c -I. $(CFLAGS_FOR_BUILD) $(srcdir)/sysinfo.c ; \ - fi - - # We need these for parallel make. ---- src/bfd/doc/Makefile.in~binutils-100_cflags_for_build.patch -+++ src/bfd/doc/Makefile.in -@@ -470,10 +470,10 @@ - - - $(MKDOC): chew.o -- $(CC_FOR_BUILD) -o $(MKDOC) chew.o $(CFLAGS) $(LOADLIBES) $(LDFLAGS) -+ $(CC_FOR_BUILD) -o $(MKDOC) chew.o $(CFLAGS_FOR_BUILD) $(LOADLIBES) $(LDFLAGS_FOR_BUILD) - - chew.o: chew.c -- $(CC_FOR_BUILD) -c -I.. -I$(srcdir)/.. -I$(srcdir)/../../include -I$(srcdir)/../../intl -I../../intl $(H_CFLAGS) $(CFLAGS) $(srcdir)/chew.c -+ $(CC_FOR_BUILD) -c -I.. -I$(srcdir)/.. -I$(srcdir)/../../include -I$(srcdir)/../../intl -I../../intl $(H_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/chew.c - - protos: libbfd.h libcoff.h bfd.h - ---- src/binutils/Makefile.in~binutils-100_cflags_for_build.patch -+++ src/binutils/Makefile.in -@@ -978,20 +978,20 @@ - ./sysinfo$(EXEEXT_FOR_BUILD) -d <$(srcdir)/sysroff.info >sysroff.h - - sysinfo$(EXEEXT_FOR_BUILD): sysinfo.o syslex.o -- $(CC_FOR_BUILD) $(CFLAGS) $(LDFLAGS) -o $@ sysinfo.o syslex.o -+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ sysinfo.o syslex.o - - syslex.o: syslex.c sysinfo.h - if [ -r syslex.c ]; then \ -- $(CC_FOR_BUILD) -c -I. $(CFLAGS) syslex.c ; \ -+ $(CC_FOR_BUILD) -c -I. $(CFLAGS_FOR_BUILD) syslex.c ; \ - else \ -- $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(CFLAGS) $(srcdir)/syslex.c ;\ -+ $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(CFLAGS_FOR_BUILD) $(srcdir)/syslex.c ;\ - fi - - sysinfo.o: sysinfo.c - if [ -r sysinfo.c ]; then \ -- $(CC_FOR_BUILD) -c -I. $(CFLAGS) sysinfo.c ; \ -+ $(CC_FOR_BUILD) -c -I. $(CFLAGS_FOR_BUILD) sysinfo.c ; \ - else \ -- $(CC_FOR_BUILD) -c -I. $(CFLAGS) $(srcdir)/sysinfo.c ; \ -+ $(CC_FOR_BUILD) -c -I. $(CFLAGS_FOR_BUILD) $(srcdir)/sysinfo.c ; \ - fi - - # We need these for parallel make. diff --git a/packages/binutils/binutils-cvs/binutils-2.15.90.0.3-uclibc-200-build_modules.patch b/packages/binutils/binutils-cvs/binutils-2.15.90.0.3-uclibc-200-build_modules.patch deleted file mode 100644 index 3560d2ca36..0000000000 --- a/packages/binutils/binutils-cvs/binutils-2.15.90.0.3-uclibc-200-build_modules.patch +++ /dev/null @@ -1,33 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- src/configure~binutils-2.15.90.0.3-uclibc-200-build_modules.patch -+++ src/configure -@@ -940,6 +940,11 @@ - build_configdirs=`echo ${build_libs} ${build_tools}` - fi - -+case "$target" in -+ *-*-*-uclibc*) -+ build_modules= -+ ;; -+esac - ################################################################################ - - srcname="gnu development package" ---- src/configure.in~binutils-2.15.90.0.3-uclibc-200-build_modules.patch -+++ src/configure.in -@@ -189,6 +189,11 @@ - build_configdirs=`echo ${build_libs} ${build_tools}` - fi - -+case "$target" in -+ *-*-*-uclibc*) -+ build_modules= -+ ;; -+esac - ################################################################################ - - srcname="gnu development package" diff --git a/packages/binutils/binutils-cvs/binutils-2.15.90.0.3-uclibc-210-cflags.patch b/packages/binutils/binutils-cvs/binutils-2.15.90.0.3-uclibc-210-cflags.patch deleted file mode 100644 index 40a71c602a..0000000000 --- a/packages/binutils/binutils-cvs/binutils-2.15.90.0.3-uclibc-210-cflags.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- binutils-2.15.90.0.3/bfd/doc/Makefile.am.cflags 2004-01-14 16:07:44.000000000 -0500 -+++ binutils-2.15.90.0.3/bfd/doc/Makefile.am 2004-04-22 22:06:35.000000000 -0400 -@@ -55,10 +55,10 @@ - MKDOC = chew$(EXEEXT_FOR_BUILD) - - $(MKDOC): chew.o -- $(CC_FOR_BUILD) -o $(MKDOC) chew.o $(CFLAGS) $(LOADLIBES) $(LDFLAGS) -+ $(CC_FOR_BUILD) -o $(MKDOC) chew.o $(CFLAGS_FOR_BUILD) $(LOADLIBES) $(LDFLAGS) - - chew.o: chew.c -- $(CC_FOR_BUILD) -c -I.. -I$(srcdir)/.. -I$(srcdir)/../../include -I$(srcdir)/../../intl -I../../intl $(H_CFLAGS) $(CFLAGS) $(srcdir)/chew.c -+ $(CC_FOR_BUILD) -c -I.. -I$(srcdir)/.. -I$(srcdir)/../../include -I$(srcdir)/../../intl -I../../intl $(H_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/chew.c - - protos: libbfd.h libcoff.h bfd.h - ---- binutils-2.15.90.0.3/bfd/doc/Makefile.in.cflags 2004-04-12 15:56:34.000000000 -0400 -+++ binutils-2.15.90.0.3/bfd/doc/Makefile.in 2004-04-22 22:06:35.000000000 -0400 -@@ -472,10 +472,10 @@ - - - $(MKDOC): chew.o -- $(CC_FOR_BUILD) -o $(MKDOC) chew.o $(CFLAGS) $(LOADLIBES) $(LDFLAGS) -+ $(CC_FOR_BUILD) -o $(MKDOC) chew.o $(CFLAGS_FOR_BUILD) $(LOADLIBES) $(LDFLAGS) - - chew.o: chew.c -- $(CC_FOR_BUILD) -c -I.. -I$(srcdir)/.. -I$(srcdir)/../../include -I$(srcdir)/../../intl -I../../intl $(H_CFLAGS) $(CFLAGS) $(srcdir)/chew.c -+ $(CC_FOR_BUILD) -c -I.. -I$(srcdir)/.. -I$(srcdir)/../../include -I$(srcdir)/../../intl -I../../intl $(H_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/chew.c - - protos: libbfd.h libcoff.h bfd.h - diff --git a/packages/binutils/binutils-cvs/binutils-2.15.91.0.1-uclibc-100-conf.patch b/packages/binutils/binutils-cvs/binutils-2.15.91.0.1-uclibc-100-conf.patch deleted file mode 100644 index 6d0ce34947..0000000000 --- a/packages/binutils/binutils-cvs/binutils-2.15.91.0.1-uclibc-100-conf.patch +++ /dev/null @@ -1,603 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- src/bfd/config.bfd~binutils-2.15.91.0.1-uclibc-100-conf -+++ src/bfd/config.bfd -@@ -140,7 +140,7 @@ - targ_defvec=ecoffalpha_little_vec - targ_selvecs=bfd_elf64_alpha_vec - ;; -- alpha*-*-linux-gnu* | alpha*-*-elf*) -+ alpha*-*-linux-gnu* | alpha*-*-linux-uclibc* | alpha*-*-elf*) - targ_defvec=bfd_elf64_alpha_vec - targ_selvecs=ecoffalpha_little_vec - ;; -@@ -150,7 +150,7 @@ - alpha*-*-*) - targ_defvec=ecoffalpha_little_vec - ;; -- ia64*-*-freebsd* | ia64*-*-netbsd* | ia64*-*-linux-gnu* | ia64*-*-elf* | ia64*-*-kfreebsd*-gnu) -+ ia64*-*-freebsd* | ia64*-*-netbsd* | ia64*-*-linux-gnu* | ia64*-*-elf* | ia64*-*-linux-uclibc* | ia64*-*-kfreebsd*-gnu) - targ_defvec=bfd_elf64_ia64_little_vec - targ_selvecs="bfd_elf64_ia64_big_vec bfd_efi_app_ia64_vec" - ;; -@@ -227,7 +227,7 @@ - targ_defvec=bfd_elf32_littlearm_vec - targ_selvecs=bfd_elf32_bigarm_vec - ;; -- armeb-*-elf | arm*b-*-linux-gnu*) -+ armeb-*-elf | arm*b-*-linux-gnu* | arm*b-*-linux-uclibc*) - targ_defvec=bfd_elf32_bigarm_vec - targ_selvecs=bfd_elf32_littlearm_vec - ;; -@@ -237,7 +237,7 @@ - ;; - arm-*-elf | arm-*-freebsd* | arm*-*-linux-gnu* | arm*-*-conix* | \ - arm*-*-uclinux* | arm-*-kfreebsd*-gnu | arm-*-vxworks | \ -- arm*-*-eabi* ) -+ arm*-*-eabi* | arm*-*-linux-uclibc* ) - targ_defvec=bfd_elf32_littlearm_vec - targ_selvecs=bfd_elf32_bigarm_vec - ;; -@@ -381,7 +381,7 @@ - ;; - - #ifdef BFD64 -- hppa*64*-*-linux-gnu*) -+ hppa*64*-*-linux-gnu* | hppa*64*-*-linux-uclibc*) - targ_defvec=bfd_elf64_hppa_linux_vec - targ_selvecs=bfd_elf64_hppa_vec - ;; -@@ -392,7 +392,7 @@ - ;; - #endif - -- hppa*-*-linux-gnu*) -+ hppa*-*-linux-gnu* | hppa*-*-linux-uclibc*) - targ_defvec=bfd_elf32_hppa_linux_vec - targ_selvecs=bfd_elf32_hppa_vec - ;; -@@ -525,7 +525,7 @@ - targ_selvecs=bfd_elf32_i386_vec - targ_underscore=yes - ;; -- i[3-7]86-*-linux-gnu*) -+ i[3-7]86-*-linux-gnu* | i[3-7]86-*-linux-uclibc*) - targ_defvec=bfd_elf32_i386_vec - targ_selvecs="i386linux_vec bfd_efi_app_ia32_vec" - targ64_selvecs=bfd_elf64_x86_64_vec -@@ -539,7 +539,7 @@ - targ_defvec=bfd_elf64_x86_64_vec - targ_selvecs="bfd_elf32_i386_vec i386netbsd_vec i386coff_vec bfd_efi_app_ia32_vec" - ;; -- x86_64-*-linux-gnu*) -+ x86_64-*-linux-gnu* | x86_64-*-linux-uclibc*) - targ_defvec=bfd_elf64_x86_64_vec - targ_selvecs="bfd_elf32_i386_vec i386linux_vec bfd_efi_app_ia32_vec" - ;; -@@ -715,7 +715,7 @@ - targ_selvecs=bfd_elf32_m68k_vec - targ_underscore=yes - ;; -- m68*-*-linux-gnu*) -+ m68*-*-linux-gnu* | m68*-*-linux-uclibc*) - targ_defvec=bfd_elf32_m68k_vec - targ_selvecs=m68klinux_vec - ;; -@@ -1001,7 +1001,8 @@ - ;; - #endif - powerpc-*-*bsd* | powerpc-*-elf* | powerpc-*-sysv4* | powerpc-*-eabi* | \ -- powerpc-*-solaris2* | powerpc-*-linux-gnu* | powerpc-*-rtems* | \ -+ powerpc-*-solaris2* | powerpc-*-linux-gnu* | powerpc-*-linux-uclibc* | \ -+ powerpc-*-rtems* | \ - powerpc-*-chorus* | powerpc-*-vxworks* | powerpc-*-windiss*) - targ_defvec=bfd_elf32_powerpc_vec - targ_selvecs="rs6000coff_vec bfd_elf32_powerpcle_vec ppcboot_vec" -@@ -1038,8 +1039,8 @@ - targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec ppcboot_vec" - ;; - powerpcle-*-elf* | powerpcle-*-sysv4* | powerpcle-*-eabi* | \ -- powerpcle-*-solaris2* | powerpcle-*-linux-gnu* | powerpcle-*-vxworks* |\ -- powerpcle-*-rtems*) -+ powerpcle-*-solaris2* | powerpcle-*-linux-gnu* | powerpcle-*-linux-uclibc* |\ -+ powerpcle-*-vxworks* | powerpcle-*-rtems*) - targ_defvec=bfd_elf32_powerpcle_vec - targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec ppcboot_vec" - targ64_selvecs="bfd_elf64_powerpc_vec bfd_elf64_powerpcle_vec" -@@ -1206,7 +1207,7 @@ - targ_selvecs="bfd_elf32_sparc_vec sunos_big_vec" - targ_underscore=yes - ;; -- sparc-*-linux-gnu*) -+ sparc-*-linux-gnu* | sparc-*-linux-uclibc*) - targ_defvec=bfd_elf32_sparc_vec - targ_selvecs="sparclinux_vec bfd_elf64_sparc_vec sunos_big_vec" - ;; -@@ -1253,7 +1254,7 @@ - targ_defvec=sunos_big_vec - targ_underscore=yes - ;; -- sparc64-*-linux-gnu*) -+ sparc64-*-linux-gnu* | sparc64-*-linux-uclibc*) - targ_defvec=bfd_elf64_sparc_vec - targ_selvecs="bfd_elf32_sparc_vec sparclinux_vec sunos_big_vec" - ;; ---- src/bfd/configure~binutils-2.15.91.0.1-uclibc-100-conf -+++ src/bfd/configure -@@ -3583,6 +3583,11 @@ - lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` - ;; - -+linux-uclibc*) -+ lt_cv_deplibs_check_method=pass_all -+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` -+ ;; -+ - netbsd* | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' -@@ -9914,7 +9919,7 @@ - alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu) - COREFILE='' - ;; -- alpha*-*-linux-gnu*) -+ alpha*-*-linux-gnu* | alpha*-*-linux-uclibc*) - COREFILE=trad-core.lo - TRAD_HEADER='"hosts/alphalinux.h"' - ;; -@@ -9978,7 +9983,7 @@ - COREFILE=trad-core.lo - TRAD_HEADER='"hosts/i386mach3.h"' - ;; -- i[3-7]86-*-linux-gnu*) -+ i[3-7]86-*-linux-gnu* | i[3-7]86-*-linux-uclibc*) - COREFILE=trad-core.lo - TRAD_HEADER='"hosts/i386linux.h"' - ;; -@@ -10016,7 +10021,7 @@ - COREFILE=trad-core.lo - TRAD_HEADER='"hosts/hp300bsd.h"' - ;; -- m68*-*-linux-gnu*) -+ m68*-*-linux-gnu* | m68*-*-linux-uclibc*) - COREFILE=trad-core.lo - TRAD_HEADER='"hosts/m68klinux.h"' - ;; ---- src/bfd/configure.in~binutils-2.15.91.0.1-uclibc-100-conf -+++ src/bfd/configure.in -@@ -163,7 +163,7 @@ - alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu) - COREFILE='' - ;; -- alpha*-*-linux-gnu*) -+ alpha*-*-linux-gnu* | alpha*-*-linux-uclibc*) - COREFILE=trad-core.lo - TRAD_HEADER='"hosts/alphalinux.h"' - ;; -@@ -248,7 +248,7 @@ - TRAD_HEADER='"hosts/i386mach3.h"' - ;; - changequote(,)dnl -- i[3-7]86-*-linux-gnu*) -+ i[3-7]86-*-linux-gnu* | i[3-7]86-*-linux-uclibc*) - changequote([,])dnl - COREFILE=trad-core.lo - TRAD_HEADER='"hosts/i386linux.h"' -@@ -289,7 +289,7 @@ - COREFILE=trad-core.lo - TRAD_HEADER='"hosts/hp300bsd.h"' - ;; -- m68*-*-linux-gnu*) -+ m68*-*-linux-gnu* | m68*-*-linux-uclibc*) - COREFILE=trad-core.lo - TRAD_HEADER='"hosts/m68klinux.h"' - ;; ---- src/gas/configure~binutils-2.15.91.0.1-uclibc-100-conf -+++ src/gas/configure -@@ -3420,6 +3420,11 @@ - lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` - ;; - -+linux-uclibc*) -+ lt_cv_deplibs_check_method=pass_all -+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` -+ ;; -+ - netbsd* | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' -@@ -4256,6 +4261,7 @@ - alpha*-*-osf*) fmt=ecoff ;; - alpha*-*-linuxecoff*) fmt=ecoff ;; - alpha*-*-linux-gnu*) fmt=elf em=linux ;; -+ alpha*-*-linux-uclibc*) fmt=elf em=linux ;; - alpha*-*-netbsd*) fmt=elf em=nbsd ;; - alpha*-*-openbsd*) fmt=elf em=obsd ;; - -@@ -4271,6 +4277,7 @@ - arm*-*-conix*) fmt=elf ;; - arm-*-linux*aout*) fmt=aout em=linux ;; - arm*-*-linux-gnu*) fmt=elf em=linux ;; -+ arm*-*-linux-uclibc*) fmt=elf em=linux ;; - arm*-*-uclinux*) fmt=elf em=linux ;; - arm-*-netbsdelf*) fmt=elf em=nbsd ;; - arm-*-*n*bsd*) fmt=aout em=nbsd ;; -@@ -4284,6 +4291,7 @@ - - cris-*-linux-gnu* | crisv32-*-linux-gnu*) - fmt=multi bfd_gas=yes em=linux ;; -+ cris-*-linux-uclibc*) fmt=multi bfd_gas=yes em=linux ;; - cris-*-* | crisv32-*-*) fmt=multi bfd_gas=yes ;; - - crx-*-elf*) fmt=elf ;; -@@ -4343,7 +4351,9 @@ - i386-*-linux*oldld) fmt=aout em=linux ;; - i386-*-linux*coff*) fmt=coff em=linux ;; - i386-*-linux-gnu*) fmt=elf em=linux ;; -+ i386-*-linux-uclibc*) fmt=elf em=linux ;; - x86_64-*-linux-gnu*) fmt=elf em=linux ;; -+ x86_64-*-linux-uclibc*) fmt=elf em=linux ;; - i386-*-lynxos*) fmt=elf em=lynx bfd_gas=yes ;; - i386-*-sysv[45]*) fmt=elf ;; - i386-*-solaris*) fmt=elf ;; -@@ -4403,6 +4413,7 @@ - ia64-*-elf*) fmt=elf ;; - ia64-*-aix*) fmt=elf em=ia64aix ;; - ia64-*-linux-gnu*) fmt=elf em=linux ;; -+ ia64-*-linux-uclibc*) fmt=elf em=linux ;; - ia64-*-hpux*) fmt=elf em=hpux ;; - ia64-*-netbsd*) fmt=elf em=nbsd ;; - -@@ -4430,6 +4441,7 @@ - m68k-*-hpux*) fmt=hp300 em=hp300 ;; - m68k-*-linux*aout*) fmt=aout em=linux ;; - m68k-*-linux-gnu*) fmt=elf em=linux ;; -+ m68k-*-linux-uclibc*) fmt=elf em=linux ;; - m68k-*-uclinux*) fmt=elf ;; - m68k-*-gnu*) fmt=elf ;; - m68k-*-lynxos*) fmt=coff em=lynx ;; -@@ -4504,7 +4516,7 @@ - ppc-*-beos*) fmt=coff ;; - ppc-*-*n*bsd* | ppc-*-elf*) fmt=elf ;; - ppc-*-eabi* | ppc-*-sysv4*) fmt=elf ;; -- ppc-*-linux-gnu*) fmt=elf em=linux -+ ppc-*-linux-uclibc* | ppc-*-linux-gnu*) fmt=elf em=linux - case "$endian" in - big) ;; - *) { { echo "$as_me:$LINENO: error: GNU/Linux must be configured big endian" >&5 -@@ -4531,7 +4543,9 @@ - ppc-*-lynxos*) fmt=elf em=lynx bfd_gas=yes ;; - - s390x-*-linux-gnu*) fmt=elf em=linux ;; -+ s390x-*-linux-uclibc*) fmt=elf em=linux ;; - s390-*-linux-gnu*) fmt=elf em=linux ;; -+ s390-*-linux-uclibc*) fmt=elf em=linux ;; - - sh*-*-linux*) fmt=elf em=linux - case ${cpu} in -@@ -4566,6 +4580,7 @@ - sparc-*-coff) fmt=coff ;; - sparc-*-linux*aout*) fmt=aout em=linux ;; - sparc-*-linux-gnu*) fmt=elf em=linux ;; -+ sparc-*-linux-uclibc*) fmt=elf em=linux ;; - sparc-*-lynxos*) fmt=coff em=lynx ;; - sparc-fujitsu-none) fmt=aout ;; - sparc-*-elf) fmt=elf ;; ---- src/gas/configure.in~binutils-2.15.91.0.1-uclibc-100-conf -+++ src/gas/configure.in -@@ -202,6 +202,7 @@ - alpha*-*-osf*) fmt=ecoff ;; - alpha*-*-linuxecoff*) fmt=ecoff ;; - alpha*-*-linux-gnu*) fmt=elf em=linux ;; -+ alpha*-*-linux-uclibc*) fmt=elf em=linux ;; - alpha*-*-netbsd*) fmt=elf em=nbsd ;; - alpha*-*-openbsd*) fmt=elf em=obsd ;; - -@@ -217,6 +218,7 @@ - arm*-*-conix*) fmt=elf ;; - arm-*-linux*aout*) fmt=aout em=linux ;; - arm*-*-linux-gnu*) fmt=elf em=linux ;; -+ arm*-*-linux-uclibc*) fmt=elf em=linux ;; - arm*-*-uclinux*) fmt=elf em=linux ;; - arm-*-netbsdelf*) fmt=elf em=nbsd ;; - arm-*-*n*bsd*) fmt=aout em=nbsd ;; -@@ -230,6 +232,7 @@ - - cris-*-linux-gnu* | crisv32-*-linux-gnu*) - fmt=multi bfd_gas=yes em=linux ;; -+ cris-*-linux-uclibc*) fmt=multi bfd_gas=yes em=linux ;; - cris-*-* | crisv32-*-*) fmt=multi bfd_gas=yes ;; - - crx-*-elf*) fmt=elf ;; -@@ -289,7 +292,9 @@ - i386-*-linux*oldld) fmt=aout em=linux ;; - i386-*-linux*coff*) fmt=coff em=linux ;; - i386-*-linux-gnu*) fmt=elf em=linux ;; -+ i386-*-linux-uclibc*) fmt=elf em=linux ;; - x86_64-*-linux-gnu*) fmt=elf em=linux ;; -+ x86_64-*-linux-uclibc*) fmt=elf em=linux ;; - i386-*-lynxos*) fmt=elf em=lynx bfd_gas=yes ;; - changequote(,)dnl - i386-*-sysv[45]*) fmt=elf ;; -@@ -342,6 +347,7 @@ - ia64-*-elf*) fmt=elf ;; - ia64-*-aix*) fmt=elf em=ia64aix ;; - ia64-*-linux-gnu*) fmt=elf em=linux ;; -+ ia64-*-linux-uclibc*) fmt=elf em=linux ;; - ia64-*-hpux*) fmt=elf em=hpux ;; - ia64-*-netbsd*) fmt=elf em=nbsd ;; - -@@ -369,6 +375,7 @@ - m68k-*-hpux*) fmt=hp300 em=hp300 ;; - m68k-*-linux*aout*) fmt=aout em=linux ;; - m68k-*-linux-gnu*) fmt=elf em=linux ;; -+ m68k-*-linux-uclibc*) fmt=elf em=linux ;; - m68k-*-uclinux*) fmt=elf ;; - m68k-*-gnu*) fmt=elf ;; - m68k-*-lynxos*) fmt=coff em=lynx ;; -@@ -440,7 +447,7 @@ - ppc-*-beos*) fmt=coff ;; - ppc-*-*n*bsd* | ppc-*-elf*) fmt=elf ;; - ppc-*-eabi* | ppc-*-sysv4*) fmt=elf ;; -- ppc-*-linux-gnu*) fmt=elf em=linux -+ ppc-*-linux-uclibc* | ppc-*-linux-gnu*) fmt=elf em=linux - case "$endian" in - big) ;; - *) AC_MSG_ERROR(GNU/Linux must be configured big endian) ;; -@@ -460,7 +467,9 @@ - ppc-*-lynxos*) fmt=elf em=lynx bfd_gas=yes ;; - - s390x-*-linux-gnu*) fmt=elf em=linux ;; -+ s390x-*-linux-uclibc*) fmt=elf em=linux ;; - s390-*-linux-gnu*) fmt=elf em=linux ;; -+ s390-*-linux-uclibc*) fmt=elf em=linux ;; - - sh*-*-linux*) fmt=elf em=linux - case ${cpu} in -@@ -491,6 +500,7 @@ - sparc-*-coff) fmt=coff ;; - sparc-*-linux*aout*) fmt=aout em=linux ;; - sparc-*-linux-gnu*) fmt=elf em=linux ;; -+ sparc-*-linux-uclibc*) fmt=elf em=linux ;; - sparc-*-lynxos*) fmt=coff em=lynx ;; - sparc-fujitsu-none) fmt=aout ;; - sparc-*-elf) fmt=elf ;; ---- src/ld/configure~binutils-2.15.91.0.1-uclibc-100-conf -+++ src/ld/configure -@@ -1579,6 +1579,11 @@ - lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` - ;; - -+linux-uclibc*) -+ lt_cv_deplibs_check_method=pass_all -+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` -+ ;; -+ - netbsd* | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' ---- src/ld/configure.tgt~binutils-2.15.91.0.1-uclibc-100-conf -+++ src/ld/configure.tgt -@@ -32,6 +32,7 @@ - targ_extra_libpath=$targ_extra_emuls ;; - cris-*-linux-gnu* | cris-*-linux-gnu*) - targ_emul=crislinux ;; -+cris-*-linux-uclibc*) targ_emul=crislinux ;; - cris-*-* | crisv32-*-*) targ_emul=criself - targ_extra_emuls="crisaout crislinux" - targ_extra_libpath=$targ_extra_emuls ;; -@@ -62,14 +63,16 @@ - tdir_elf32_sparc=`echo ${targ_alias} | sed -e 's/aout//'` - tdir_sun4=sparc-sun-sunos4 - ;; --sparc64-*-linux-gnu*) targ_emul=elf64_sparc -+sparc64-*-linux-gnu* | sparc64-*-linux-uclibc*) \ -+ targ_emul=elf64_sparc - targ_extra_emuls="elf32_sparc sparclinux sun4" - targ_extra_libpath=elf32_sparc - tdir_elf32_sparc=`echo ${targ_alias} | sed -e 's/64//'` - tdir_sparclinux=${tdir_elf32_sparc}aout - tdir_sun4=sparc-sun-sunos4 - ;; --sparc*-*-linux-gnu*) targ_emul=elf32_sparc -+sparc*-*-linux-gnu* | sparc*-*-linux-uclibc*) \ -+ targ_emul=elf32_sparc - targ_extra_emuls="sparclinux elf64_sparc sun4" - targ_extra_libpath=elf64_sparc - tdir_sparclinux=${targ_alias}aout -@@ -132,7 +135,7 @@ - m68*-apple-aux*) targ_emul=m68kaux ;; - maxq-*-coff) targ_emul=maxqcoff;; - *-tandem-none) targ_emul=st2000 ;; --i370-*-elf* | i370-*-linux-gnu*) targ_emul=elf32i370 ;; -+i370-*-elf* | i370-*-linux-gnu* | i370-*-linux-uclibc*) targ_emul=elf32i370 ;; - i[3-7]86-*-nto-qnx*) targ_emul=i386nto ;; - i[3-7]86-*-vsta) targ_emul=vsta ;; - i[3-7]86-go32-rtems*) targ_emul=i386go32 ;; -@@ -156,14 +159,16 @@ - tdir_elf_i386=`echo ${targ_alias} | sed -e 's/aout//'` - ;; - i[3-7]86-*-linux*oldld) targ_emul=i386linux; targ_extra_emuls=elf_i386 ;; --i[3-7]86-*-linux-gnu*) targ_emul=elf_i386 -+i[3-7]86-*-linux-gnu* | i[3-7]86-*-linux-uclibc*) \ -+ targ_emul=elf_i386 - targ_extra_emuls=i386linux - if test x${want64} = xtrue; then - targ_extra_emuls="$targ_extra_emuls elf_x86_64" - fi - tdir_i386linux=${targ_alias}aout - ;; --x86_64-*-linux-gnu*) targ_emul=elf_x86_64 -+x86_64-*-linux-gnu* | x86_64-*-linux-uclibc*) \ -+ targ_emul=elf_x86_64 - targ_extra_emuls="elf_i386 i386linux" - targ_extra_libpath=elf_i386 - tdir_i386linux=`echo ${targ_alias}aout | sed -e 's/x86_64/i386/'` -@@ -263,10 +268,13 @@ - arm-*-kaos*) targ_emul=armelf ;; - arm9e-*-elf) targ_emul=armelf ;; - arm*b-*-linux-gnu*) targ_emul=armelfb_linux; targ_extra_emuls=armelfb ;; -+arm*b-*-linux-uclibc*) targ_emul=armelfb_linux; targ_extra_emuls=armelfb ;; - arm*-*-linux-gnu*) targ_emul=armelf_linux; targ_extra_emuls=armelf ;; -+arm*-*-linux-uclibc*) targ_emul=armelf_linux; targ_extra_emuls=armelf ;; - arm*-*-uclinux*) targ_emul=armelf_linux; targ_extra_emuls=armelf ;; - arm*-*-conix*) targ_emul=armelf ;; --thumb-*-linux-gnu* | thumb-*-uclinux*) targ_emul=armelf_linux; targ_extra_emuls=armelf ;; -+thumb-*-linux-gnu* | thumb-*-linux-uclibc* | thumb-*-uclinux*) \ -+ targ_emul=armelf_linux; targ_extra_emuls=armelf ;; - strongarm-*-coff) targ_emul=armcoff ;; - strongarm-*-elf) targ_emul=armelf ;; - strongarm-*-kaos*) targ_emul=armelf ;; -@@ -370,7 +378,8 @@ - targ_extra_emuls=m68kelf - tdir_m68kelf=`echo ${targ_alias} | sed -e 's/aout//'` - ;; --m68k-*-linux-gnu*) targ_emul=m68kelf -+m68k-*-linux-gnu* | m68k-*-linux-uclibc*) \ -+ targ_emul=m68kelf - targ_extra_emuls=m68klinux - tdir_m68klinux=`echo ${targ_alias} | sed -e 's/linux/linuxaout/'` - ;; -@@ -387,9 +396,9 @@ - m68*-*-psos*) targ_emul=m68kpsos ;; - m68*-*-rtemscoff*) targ_emul=m68kcoff ;; - m68*-*-rtems*) targ_emul=m68kelf ;; --hppa*64*-*-linux-gnu*) targ_emul=hppa64linux ;; -+hppa*64*-*-linux-gnu* | hppa*64*-*-linux-uclibc*) targ_emul=hppa64linux ;; - hppa*64*-*) targ_emul=elf64hppa ;; --hppa*-*-linux-gnu*) targ_emul=hppalinux ;; -+hppa*-*-linux-gnu* | hppa*-*-linux-uclibc*) targ_emul=hppalinux ;; - hppa*-*-*elf*) targ_emul=hppaelf ;; - hppa*-*-lites*) targ_emul=hppaelf ;; - hppa*-*-netbsd*) targ_emul=hppanbsd ;; -@@ -435,16 +444,20 @@ - mips*-*-vxworks*) targ_emul=elf32ebmip - targ_extra_emuls="elf32elmip" ;; - mips*-*-windiss) targ_emul=elf32mipswindiss ;; --mips64*el-*-linux-gnu*) targ_emul=elf32ltsmipn32 -+mips64*el-*-linux-gnu* | mips64*el-*-linux-uclibc*) -+ targ_emul=elf32ltsmipn32 - targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip" - ;; --mips64*-*-linux-gnu*) targ_emul=elf32btsmipn32 -+mips64*-*-linux-gnu* | mips64*-*-linux-uclibc*) -+ targ_emul=elf32btsmipn32 - targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip" - ;; --mips*el-*-linux-gnu*) targ_emul=elf32ltsmip -+mips*el-*-linux-gnu* | mips*el-*-linux-uclibc*) -+ targ_emul=elf32ltsmip - targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip" - ;; --mips*-*-linux-gnu*) targ_emul=elf32btsmip -+mips*-*-linux-gnu* | mips*-*-linux-uclibc*) -+ targ_emul=elf32btsmip - targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" - ;; - mips*-*-lnews*) targ_emul=mipslnews ;; -@@ -467,6 +480,10 @@ - alpha*-*-linux-gnu*) targ_emul=elf64alpha targ_extra_emuls=alpha - tdir_alpha=`echo ${targ_alias} | sed -e 's/linux/linuxecoff/'` - ;; -+alpha*-*-linux-uclibc*) targ_emul=elf64alpha targ_extra_emuls=alpha -+ # The following needs to be checked... -+ tdir_alpha=`echo ${targ_alias} | sed -e 's/linux/linuxecoff/'` -+ ;; - alpha*-*-osf*) targ_emul=alpha ;; - alpha*-*-gnu*) targ_emul=elf64alpha ;; - alpha*-*-netware*) targ_emul=alpha ;; ---- src/configure~binutils-2.15.91.0.1-uclibc-100-conf -+++ src/configure -@@ -1344,6 +1344,18 @@ - i[3456789]86-*-coff | i[3456789]86-*-elf) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; -+ i[3456789]86-*-linux-uclibc) -+ # This section makes it possible to build newlib natively on linux. -+ # If we are using a cross compiler then don't configure newlib. -+ if test x${is_cross_compiler} != xno ; then -+ noconfigdirs="$noconfigdirs target-newlib" -+ fi -+ noconfigdirs="$noconfigdirs target-libgloss" -+ # If we are not using a cross compiler, do configure newlib. -+ # Note however, that newlib will only be configured in this situation -+ # if the --with-newlib option has been given, because otherwise -+ # 'target-newlib' will appear in skipdirs. -+ ;; - i[3456789]86-*-linux*) - # The GCC port for glibc1 has no MD_FALLBACK_FRAME_STATE_FOR, so let's - # not build java stuff by default. ---- src/configure.in~binutils-2.15.91.0.1-uclibc-100-conf -+++ src/configure.in -@@ -566,6 +566,19 @@ - i[[3456789]]86-*-coff | i[[3456789]]86-*-elf) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; -+ i[3456789]86-*-linux-uclibc) -+ # This section makes it possible to build newlib natively on linux. -+ # If we are using a cross compiler then don't configure newlib. -+ if test x${is_cross_compiler} != xno ; then -+ noconfigdirs="$noconfigdirs target-newlib" -+ fi -+ noconfigdirs="$noconfigdirs target-libgloss" -+ build_modules= -+ # If we are not using a cross compiler, do configure newlib. -+ # Note however, that newlib will only be configured in this situation -+ # if the --with-newlib option has been given, because otherwise -+ # 'target-newlib' will appear in skipdirs. -+ ;; - i[[3456789]]86-*-linux*) - # The GCC port for glibc1 has no MD_FALLBACK_FRAME_STATE_FOR, so let's - # not build java stuff by default. ---- src/libtool.m4~binutils-2.15.91.0.1-uclibc-100-conf -+++ src/libtool.m4 -@@ -645,6 +645,11 @@ - lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` - ;; - -+linux-uclibc*) -+ lt_cv_deplibs_check_method=pass_all -+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` -+ ;; -+ - netbsd* | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'] ---- src/ltconfig~binutils-2.15.91.0.1-uclibc-100-conf -+++ src/ltconfig -@@ -603,6 +603,7 @@ - # Transform linux* to *-*-linux-gnu*, to support old configure scripts. - case $host_os in - linux-gnu*) ;; -+linux-uclibc*) ;; - linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` - esac - -@@ -1270,6 +1271,24 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+linux-uclibc*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -+ soname_spec='${libname}${release}.so$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ # This implies no fast_install, which is unacceptable. -+ # Some rework will be needed to allow for fast_install -+ # before this can be enabled. -+ # Note: copied from linux-gnu, and may not be appropriate. -+ hardcode_into_libs=yes -+ # Assume using the uClibc dynamic linker. -+ dynamic_linker="uClibc ld.so" -+ ;; -+ - netbsd*) - need_lib_prefix=no - need_version=no diff --git a/packages/binutils/binutils-cvs/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch b/packages/binutils/binutils-cvs/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch new file mode 100644 index 0000000000..8df5b1fea0 --- /dev/null +++ b/packages/binutils/binutils-cvs/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch @@ -0,0 +1,39 @@ +# strip (and objcopy) fail to set the error code if there is no +# output file name and the rename of the stripped (or copied) file +# fails, yet the command fails to do anything. This fixes both +# objcopy and strip. +# +# modification by bero: Ported to 2.16.91.0.6 +# +#Signed-off-by: John Bowler <jbowler@acm.org> +#Signed-off-by: Bernhard Rosenkraenzer <bero@arklinux.org> +--- +# binutils/objcopy.c | 8 +++++--- +# 1 file changed, 5 insertions(+), 3 deletions(-) +# +Index: src/binutils/objcopy.c +=================================================================== +--- src.orig/binutils/objcopy.c 2007-08-09 13:26:03.000000000 +0100 ++++ src/binutils/objcopy.c 2007-08-09 16:36:12.000000000 +0100 +@@ -2787,8 +2787,9 @@ strip_main (int argc, char *argv[]) + if (preserve_dates) + set_times (tmpname, &statbuf); + if (output_file != tmpname) +- smart_rename (tmpname, output_file ? output_file : argv[i], +- preserve_dates); ++ if (smart_rename (tmpname, output_file ? output_file : argv[i], ++ preserve_dates)) ++ hold_status = 1; + status = hold_status; + } + else +@@ -3411,7 +3412,8 @@ copy_main (int argc, char *argv[]) + if (preserve_dates) + set_times (tmpname, &statbuf); + if (tmpname != output_filename) +- smart_rename (tmpname, input_filename, preserve_dates); ++ if (smart_rename (tmpname, input_filename, preserve_dates)) ++ status = 1; + } + else + unlink_if_ordinary (tmpname); diff --git a/packages/binutils/binutils-cvs/binutils-uclibc-300-001_ld_makefile_patch.patch b/packages/binutils/binutils-cvs/binutils-uclibc-300-001_ld_makefile_patch.patch new file mode 100644 index 0000000000..04a7e61e25 --- /dev/null +++ b/packages/binutils/binutils-cvs/binutils-uclibc-300-001_ld_makefile_patch.patch @@ -0,0 +1,50 @@ +#!/bin/sh -e +## 001_ld_makefile_patch.dpatch +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Description: correct where ld scripts are installed +## DP: Author: Chris Chimelis <chris@debian.org> +## DP: Upstream status: N/A +## DP: Date: ?? + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +--- binutils-2.16.91.0.1/ld/Makefile.am ++++ binutils-2.16.91.0.1/ld/Makefile.am +@@ -20,7 +20,7 @@ + # We put the scripts in the directory $(scriptdir)/ldscripts. + # We can't put the scripts in $(datadir) because the SEARCH_DIR + # directives need to be different for native and cross linkers. +-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir) + + EMUL = @EMUL@ + EMULATION_OFILES = @EMULATION_OFILES@ +--- binutils-2.16.91.0.1/ld/Makefile.in ++++ binutils-2.16.91.0.1/ld/Makefile.in +@@ -268,7 +268,7 @@ + # We put the scripts in the directory $(scriptdir)/ldscripts. + # We can't put the scripts in $(datadir) because the SEARCH_DIR + # directives need to be different for native and cross linkers. +-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir) + BASEDIR = $(srcdir)/.. + BFDDIR = $(BASEDIR)/bfd + INCDIR = $(BASEDIR)/include diff --git a/packages/binutils/binutils-cvs/binutils-uclibc-300-006_better_file_error.patch b/packages/binutils/binutils-cvs/binutils-uclibc-300-006_better_file_error.patch new file mode 100644 index 0000000000..f337611edf --- /dev/null +++ b/packages/binutils/binutils-cvs/binutils-uclibc-300-006_better_file_error.patch @@ -0,0 +1,43 @@ +#!/bin/sh -e +## 006_better_file_error.dpatch by David Kimdon <dwhedon@gordian.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Specify which filename is causing an error if the filename is a +## DP: directory. (#45832) + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c binutils-2.14.90.0.6/bfd/opncls.c +--- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c 2003-07-23 16:08:09.000000000 +0100 ++++ binutils-2.14.90.0.6/bfd/opncls.c 2003-09-10 22:35:00.000000000 +0100 +@@ -150,6 +150,13 @@ + { + bfd *nbfd; + const bfd_target *target_vec; ++ struct stat s; ++ ++ if (stat (filename, &s) == 0) ++ if (S_ISDIR(s.st_mode)) { ++ bfd_set_error (bfd_error_file_not_recognized); ++ return NULL; ++ } + + nbfd = _bfd_new_bfd (); + if (nbfd == NULL) diff --git a/packages/binutils/binutils-cvs/binutils-uclibc-300-012_check_ldrunpath_length.patch b/packages/binutils/binutils-cvs/binutils-uclibc-300-012_check_ldrunpath_length.patch new file mode 100644 index 0000000000..498651a90c --- /dev/null +++ b/packages/binutils/binutils-cvs/binutils-uclibc-300-012_check_ldrunpath_length.patch @@ -0,0 +1,47 @@ +#!/bin/sh -e +## 012_check_ldrunpath_length.dpatch by Chris Chimelis <chris@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Only generate an RPATH entry if LD_RUN_PATH is not empty, for +## DP: cases where -rpath isn't specified. (#151024) + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em binutils-2.15/ld/emultempl/elf32.em +--- /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em 2004-05-21 23:12:58.000000000 +0100 ++++ binutils-2.15/ld/emultempl/elf32.em 2004-05-21 23:12:59.000000000 +0100 +@@ -692,6 +692,8 @@ + && command_line.rpath == NULL) + { + lib_path = (const char *) getenv ("LD_RUN_PATH"); ++ if ((lib_path) && (strlen (lib_path) == 0)) ++ lib_path = NULL; + if (gld${EMULATION_NAME}_search_needed (lib_path, &n, + force)) + break; +@@ -871,6 +873,8 @@ + rpath = command_line.rpath; + if (rpath == NULL) + rpath = (const char *) getenv ("LD_RUN_PATH"); ++ if ((rpath) && (strlen (rpath) == 0)) ++ rpath = NULL; + if (! (bfd_elf_size_dynamic_sections + (output_bfd, command_line.soname, rpath, + command_line.filter_shlib, diff --git a/packages/binutils/binutils-cvs/build_fix.patch b/packages/binutils/binutils-cvs/build_fix.patch new file mode 100644 index 0000000000..eb8f5f25d3 --- /dev/null +++ b/packages/binutils/binutils-cvs/build_fix.patch @@ -0,0 +1,16 @@ +--- + libiberty/fopen_unlocked.c | 1 + + 1 file changed, 1 insertion(+) + +Index: src/libiberty/fopen_unlocked.c +=================================================================== +--- src.orig/libiberty/fopen_unlocked.c 2007-08-09 20:12:13.000000000 +0100 ++++ src/libiberty/fopen_unlocked.c 2007-08-09 20:12:21.000000000 +0100 +@@ -70,6 +70,7 @@ unchanged. + #endif + #include <stdio.h> + #ifdef HAVE_STDIO_EXT_H ++#include <sys/cdefs.h> + #include <stdio_ext.h> + #endif + diff --git a/packages/binutils/binutils.inc b/packages/binutils/binutils.inc index 007089761d..684cf54b8e 100644 --- a/packages/binutils/binutils.inc +++ b/packages/binutils/binutils.inc @@ -56,14 +56,14 @@ export LD_FOR_TARGET = "${TARGET_PREFIX}ld" export NM_FOR_TARGET = "${TARGET_PREFIX}nm" export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib" -export CC_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc ${HOST_CC_ARCH}" -export CXX_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc ${HOST_CC_ARCH}" +export CC_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" +export CXX_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" export CC_FOR_BUILD = "${BUILD_CC}" export CPP_FOR_BUILD = "${BUILD_CPP}" export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" -export CC = "${CCACHE} ${HOST_PREFIX}gcc ${HOST_CC_ARCH}" +export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" do_configure () { (cd ${S}; gnu-configize) || die "Failed to run gnu-configize" diff --git a/packages/binutils/binutils_cvs.bb b/packages/binutils/binutils_cvs.bb index 35291661f2..e719d93272 100644 --- a/packages/binutils/binutils_cvs.bb +++ b/packages/binutils/binutils_cvs.bb @@ -1,121 +1,27 @@ -SECTION = "devel" -inherit autotools gettext - -DESCRIPTION = "A GNU collection of binary utilities" -HOMEPAGE = "http://www.gnu.org/software/binutils/" -LICENSE = "GPL" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs" PV = "0.0+cvs${SRCDATE}" -PR = "r3" - -PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks" - -FILES_${PN} = " \ - ${bindir}/${TARGET_PREFIX}* \ - ${libdir}/lib*-*.so \ - ${prefix}/${TARGET_SYS}/bin/*" +PR = "r0" -FILES_${PN}-dev = " \ - ${includedir} \ - ${libdir}/*.a \ - ${libdir}/*.la \ - ${libdir}/libbfd.so \ - ${libdir}/libopcodes.so" - -FILES_${PN}-symlinks = " \ - ${bindir}/addr2line \ - ${bindir}/ar \ - ${bindir}/as \ - ${bindir}/c++filt \ - ${bindir}/gprof \ - ${bindir}/ld \ - ${bindir}/nm \ - ${bindir}/objcopy \ - ${bindir}/objdump \ - ${bindir}/ranlib \ - ${bindir}/readelf \ - ${bindir}/size \ - ${bindir}/strings \ - ${bindir}/strip" - -SRC_URI = "cvs://anoncvs:anoncvs@sources.redhat.com/cvs/src;module=binutils;method=pserver;localdir=src \ - file://ld_makefile.patch;patch=1 \ - file://better_file_error.patch;patch=1 \ - file://signed_char_fix.patch;patch=1 \ - file://binutils-100_cflags_for_build.patch;patch=1 \ - file://binutils-2.15.91.0.1-uclibc-100-conf.patch;patch=1 \ - file://binutils-2.15.90.0.3-uclibc-200-build_modules.patch;patch=1" +require binutils.inc S = "${WORKDIR}/src" -B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" - -EXTRA_OECONF = "--with-sysroot=/ \ - --program-prefix=${TARGET_PREFIX} \ - --enable-shared" - -# This is necessary due to a bug in the binutils Makefiles -EXTRA_OEMAKE = "configure-build-libiberty all" - -export AR = "${HOST_PREFIX}ar" -export AS = "${HOST_PREFIX}as" -export LD = "${HOST_PREFIX}ld" -export NM = "${HOST_PREFIX}nm" -export RANLIB = "${HOST_PREFIX}ranlib" -export OBJCOPY = "${HOST_PREFIX}objcopy" -export OBJDUMP = "${HOST_PREFIX}objdump" - -export AR_FOR_TARGET = "${TARGET_PREFIX}ar" -export AS_FOR_TARGET = "${TARGET_PREFIX}as" -export LD_FOR_TARGET = "${TARGET_PREFIX}ld" -export NM_FOR_TARGET = "${TARGET_PREFIX}nm" -export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib" - -export CC_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc" -export CXX_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc" -export CC_FOR_BUILD = "${BUILD_CC}" - -export CC = "${CCACHE} ${HOST_PREFIX}gcc" - -do_configure () { - (cd ${S}; gnu-configize) || die "Failed to run gnu-configize" - oe_runconf -} - -do_stage () { - oe_libinstall -so -a -C opcodes libopcodes ${STAGING_LIBDIR}/ - oe_libinstall -a -C libiberty libiberty ${STAGING_LIBDIR}/ - oe_libinstall -so -a -C bfd libbfd ${STAGING_LIBDIR}/ - install -m 0644 ${S}/include/dis-asm.h ${STAGING_INCDIR}/ - install -m 0644 ${S}/include/symcat.h ${STAGING_INCDIR}/ - install -m 0644 ${S}/include/libiberty.h ${STAGING_INCDIR}/ - install -m 0644 ${S}/include/ansidecl.h ${STAGING_INCDIR}/ - install -m 0644 ${S}/include/bfdlink.h ${STAGING_INCDIR}/ - install -m 0644 bfd/bfd.h ${STAGING_INCDIR}/ -} - -do_install () { - autotools_do_install - - # We don't really need these, so we'll remove them... - rm -rf ${D}${libdir}/ldscripts - - # Fix the /usr/${TARGET_SYS}/bin/* links - for l in ${D}${prefix}/${TARGET_SYS}/bin/*; do - rm -f $l - ln -sf `echo ${prefix}/${TARGET_SYS}/bin \ - | tr -s / \ - | sed -e 's,^/,,' -e 's,[^/]*,..,g'`${bindir}/${TARGET_PREFIX}`basename $l` $l - done - - # Install the libiberty header - install -m 644 ${S}/include/ansidecl.h ${D}${includedir} - install -m 644 ${S}/include/libiberty.h ${D}${includedir} - - cd ${D}${bindir} - - # Symlinks for ease of running these on the native target - for p in ${TARGET_SYS}-* ; do - ln -sf $p `echo $p | sed -e s,${TARGET_SYS}-,,` - done -} +SRC_URI = "cvs://anoncvs:anoncvs@sources.redhat.com/cvs/src;module=binutils;method=pserver;localdir=src \ + file://build_fix.patch;patch=1 \ + file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \ + file://110-arm-eabi-conf.patch;patch=1 \ + file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \ + file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \ + file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1" + +#EXTRA_OECONF = "--with-sysroot=/" + +do_configure_prepend () { + # RP: + # Remove rda and libgloss since they won't cross compile + # we don't need them anyway... + # Also remove gdb, we build that separately. + rm ${S}/gdb -Rf + rm ${S}/rda -Rf + rm ${S}/libgloss -Rf +}
\ No newline at end of file diff --git a/packages/bluez/bluez-gnome_0.13.bb b/packages/bluez/bluez-gnome_0.13.bb new file mode 100644 index 0000000000..d50e8e5fde --- /dev/null +++ b/packages/bluez/bluez-gnome_0.13.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "BLuetooth configuration applet" +LICENSE = "GPL+LGPL" + +DEPENDS = "dbus-glib gconf libnotify gtk+" + +SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz" + +inherit autotools pkgconfig gconf + +FILES_${PN} += "${datadir}/gconf" + diff --git a/packages/bluez/bluez-gnome_cvs.bb b/packages/bluez/bluez-gnome_cvs.bb index ea5bbe6c2f..8900bda6bf 100644 --- a/packages/bluez/bluez-gnome_cvs.bb +++ b/packages/bluez/bluez-gnome_cvs.bb @@ -8,7 +8,7 @@ DEPENDS = "dbus-glib gconf libnotify gtk+" SRC_URI = "cvs://anonymous@cvs.bluez.org/cvsroot/bluez;module=gnome \ " -PV = "0.10+cvs${SRCDATE}" +PV = "0.13+cvs${SRCDATE}" S = "${WORKDIR}/gnome" inherit autotools pkgconfig gconf diff --git a/packages/djvulibre/.mtn2git_empty b/packages/djvulibre/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/djvulibre/.mtn2git_empty diff --git a/packages/djvulibre/djvulibre/.mtn2git_empty b/packages/djvulibre/djvulibre/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/djvulibre/djvulibre/.mtn2git_empty diff --git a/packages/djvulibre/djvulibre/fix-cross-configure.patch b/packages/djvulibre/djvulibre/fix-cross-configure.patch new file mode 100644 index 0000000000..42d4eff715 --- /dev/null +++ b/packages/djvulibre/djvulibre/fix-cross-configure.patch @@ -0,0 +1,50 @@ +--- /tmp/acinclude.m4 2007-08-09 22:33:05.000000000 +0200 ++++ djvulibre-3.5.19/config/acinclude.m4 2007-08-09 22:33:39.288400000 +0200 +@@ -784,30 +784,6 @@ + QTDIR=no + fi + fi +- # Execute +- if test "x$ac_has_qt" != xno ; then +- AC_MSG_CHECKING([if a small Qt program runs]) +- AC_LANG_PUSH(C++) +- save_CXXFLAGS="$CXXFLAGS" +- save_LIBS="$LIBS" +- CXXFLAGS="$CXXFLAGS $CFLAGS $THREAD_CFLAGS $QT_CFLAGS $X_CFLAGS" +- LIBS="$THREAD_LIBS $QT_LIBS $X_LIBS $LIBS" +- AC_TRY_RUN([ +-#include <qfile.h> +-#include <qtextstream.h> +-#include <qglobal.h> +-int main() { +-QFile qf("confout"); if (!qf.open(IO_WriteOnly)) return 1; +-QTextStream ts(&qf); ts << QT_VERSION; return 0; +-}],[okay=yes],[okay=no; QTDIR=no]) +- CXXFLAGS="$save_CXXFLAGS" +- LIBS="$save_LIBS" +- AC_LANG_POP(C++) +- AC_MSG_RESULT($okay) +- if test "x$okay" = xno ; then +- ac_has_qt=no +- fi +- fi + # Version + if test "x$ac_has_qt" != xno ; then + AC_MSG_CHECKING([Qt version]) +--- /tmp/configure.ac 2007-08-09 22:46:50.000000000 +0200 ++++ djvulibre-3.5.19/configure.ac 2007-08-09 22:47:06.988400000 +0200 +@@ -563,14 +563,8 @@ + + /* - QT */ + #ifdef HAVE_QT +-#if HAVE_QT < 200 +-#define QT1 +-#elif HAVE_QT < 300 +-#define QT2 +-#else + #define QT3 + #endif +-#endif + + /* - X STUFF */ + #ifdef HAVE_SYS_IPC_H diff --git a/packages/djvulibre/djvulibre_3.5.19.bb b/packages/djvulibre/djvulibre_3.5.19.bb new file mode 100644 index 0000000000..5ba5751f2d --- /dev/null +++ b/packages/djvulibre/djvulibre_3.5.19.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "DjVuLibre is an open source (GPL'ed) implementation of DjVu, including viewers, browser plugins, decoders, simple encoders, and utilities." +LICENSE = "GPL" + +DEPENDS = "jpeg libpng tiff" + +SRC_URI = "http://downloads.sourceforge.net/djvu/djvulibre-${PV}.tar.gz \ + file://fix-cross-configure.patch;patch=1" + + +inherit qt4x11 autotools pkgconfig + +#export QT_LIBS = "${OE_QMAKE_LIBS_QT}" +#export QT_CFLAGS = "${OE_QMAKE_CXXFLAGS} -I${QTDIR}/include/Qt/ " + +EXTRA_OECONF = " --enable-threads \ + --with-qt=${QTDIR} " + +PACKAGES =+ "libdjvulibre" + +FILES_libdjvulibre = "${libdir}/libdjvulibre.so.*" +FILES_${PN} += "${datadir}/djvu" + +do_stage() { + autotools_stage_all +} + + diff --git a/packages/evince/evince_0.9.2.bb b/packages/evince/evince_0.9.2.bb index 64e2e41275..51bc969bff 100644 --- a/packages/evince/evince_0.9.2.bb +++ b/packages/evince/evince_0.9.2.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Evince is a document viewer for document formats like pdf, ps, djvu." LICENSE = "GPL" SECTION = "x11/office" -DEPENDS = "tiff libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring " +DEPENDS = "tiff djvulibre libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring " RDEPENDS = "espgs " RRECOMMENDS = "gnome-vfs-plugin-file" PR = "r1" @@ -12,5 +12,9 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/evince/0.9/${PN}-${PV}.tar.bz2 file://no-icon-theme.diff;patch=1;pnum=0 \ file://no-help-dir.patch;patch=1" -EXTRA_OECONF = "--without-libgnome --disable-thumbnailer --disable-scrollkeeper" +EXTRA_OECONF = " --without-libgnome \ + --disable-thumbnailer \ + --disable-scrollkeeper \ + --enable-djvu \ + " diff --git a/packages/fakeroot/fakeroot-native_1.7.1.bb b/packages/fakeroot/fakeroot-native_1.7.1.bb new file mode 100644 index 0000000000..6f2969e181 --- /dev/null +++ b/packages/fakeroot/fakeroot-native_1.7.1.bb @@ -0,0 +1,21 @@ +SECTION = "base" +require fakeroot_${PV}.bb +inherit native +RDEPENDS="util-linux-native" + +SRC_URI += "file://fix-prefix.patch;patch=1 \ + file://work-with-older-libtool.patch;patch=1" +S = "${WORKDIR}/fakeroot-${PV}" + +EXTRA_OECONF = " --program-prefix=" + +# Compatability for the rare systems not using or having SYSV +python () { + if bb.data.getVar('HOST_NONSYSV', d, True) and bb.data.getVar('HOST_NONSYSV', d, True) != '0': + bb.data.setVar('EXTRA_OECONF', ' --with-ipc=tcp --program-prefix= ', d) +} + +do_stage_append () { + oe_libinstall -so libfakeroot ${STAGING_LIBDIR}/libfakeroot/ +} + diff --git a/packages/fakeroot/fakeroot_1.7.1.bb b/packages/fakeroot/fakeroot_1.7.1.bb new file mode 100644 index 0000000000..486bf93a46 --- /dev/null +++ b/packages/fakeroot/fakeroot_1.7.1.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Gives a fake root environment" +SECTION = "base" +LICENSE = "GPL" +# fakeroot needs getopt which is provided by the util-linux package +RDEPENDS = "util-linux" +PR = "r1" + +SRC_URI = "ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_${PV}.tar.gz" + +inherit autotools + +do_stage() { + install -d ${STAGING_INCDIR}/fakeroot + install -m 644 *.h ${STAGING_INCDIR}/fakeroot + autotools_stage_all +} diff --git a/packages/fakeroot/files/work-with-older-libtool.patch b/packages/fakeroot/files/work-with-older-libtool.patch new file mode 100644 index 0000000000..05f9be87b6 --- /dev/null +++ b/packages/fakeroot/files/work-with-older-libtool.patch @@ -0,0 +1,11 @@ +--- fakeroot-1.7.1/configure.ac.orig 2007-08-09 16:03:34.000000000 -0500 ++++ fakeroot-1.7.1/configure.ac 2007-08-09 18:26:11.000000000 -0500 +@@ -7,8 +7,6 @@ + AC_CONFIG_HEADERS([config.h]) + AC_PROG_MAKE_SET + AM_PROG_LIBTOOL +-LT_INIT +-LT_LANG(C) + + AC_ARG_WITH([ipc], + AS_HELP_STRING([--with-ipc@<:@=IPCTYPE@:>@], diff --git a/packages/fluxbox/fluxbox_0.99+1.0rc.bb b/packages/fluxbox/fluxbox_0.99+1.0rc.bb index d0b52058b8..93c82025cf 100644 --- a/packages/fluxbox/fluxbox_0.99+1.0rc.bb +++ b/packages/fluxbox/fluxbox_0.99+1.0rc.bb @@ -57,7 +57,7 @@ FILES_${PN} = "${bindir} \ FILES_${PN}-gpe = "${datadir}/fluxbox/apps.gpe* \ ${datadir}/fluxbox/keys.* \ ${bindir}/gpe-logout.fluxbox \ - ${sysconfdir}keylaunchrc.fluxbox \ + ${sysconfdir}/keylaunchrc.fluxbox \ ${datadir}/fluxbox/styles/gpe-default \ ${datadir}/fluxbox/session \ ${bindir}/fluxbox-gpe-session" diff --git a/packages/gpe-login/gpe-login_0.87.bb b/packages/gpe-login/gpe-login_0.87.bb index 04839a4412..d75af4a3a0 100644 --- a/packages/gpe-login/gpe-login_0.87.bb +++ b/packages/gpe-login/gpe-login_0.87.bb @@ -6,8 +6,10 @@ SECTION = "gpe" PRIORITY = "optional" DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" RDEPENDS = "xkbd" -RPROVIDES = "gpe-session-starter" -PR = "r2" +RPROVIDES_${PN} = "gpe-session-starter" +PR = "r3" + +SRC_URI_OVERRIDES_PACKAGE_ARCH = "1" SRC_URI += "file://removeblue-fontsize8.patch;patch=1" diff --git a/packages/gpe-login/gpe-login_0.88.bb b/packages/gpe-login/gpe-login_0.88.bb index 6780add5c8..a1d4c0e7fa 100644 --- a/packages/gpe-login/gpe-login_0.88.bb +++ b/packages/gpe-login/gpe-login_0.88.bb @@ -4,10 +4,10 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" RDEPENDS = "xkbd" -RPROVIDES = "gpe-session-starter" -PR = "r2" +RPROVIDES_${PN} = "gpe-session-starter" +PR = "r3" -PACKAGE_ARCH_${PN} = "${MACHINE}" +SRC_URI_OVERRIDES_PACKAGE_ARCH = "1" inherit gpe diff --git a/packages/gpe-login/gpe-login_0.90.bb b/packages/gpe-login/gpe-login_0.90.bb index 6aeec56f12..08cfa2a0e0 100644 --- a/packages/gpe-login/gpe-login_0.90.bb +++ b/packages/gpe-login/gpe-login_0.90.bb @@ -4,10 +4,10 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" RDEPENDS = "xkbd gpe-theme-clearlooks" -RPROVIDES = "gpe-session-starter" -PR = "r1" +RPROVIDES_${PN} = "gpe-session-starter" +PR = "r2" -PACKAGE_ARCH = "${MACHINE_ARCH}" +SRC_URI_OVERRIDES_PACKAGE_ARCH = "1" GPE_TARBALL_SUFFIX = "bz2" diff --git a/packages/gpe-login/gpe-login_svn.bb b/packages/gpe-login/gpe-login_svn.bb index d38545fe57..9af539bad3 100644 --- a/packages/gpe-login/gpe-login_svn.bb +++ b/packages/gpe-login/gpe-login_svn.bb @@ -4,11 +4,13 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" RDEPENDS = "xkbd" -RPROVIDES = "gpe-session-starter" -PV = "0.88+svn-${SRCDATE}" +RPROVIDES_${PN} = "gpe-session-starter" +PV = "0.90+svn${SRCDATE}" inherit autotools +SRC_URI_OVERRIDES_PACKAGE_ARCH = "1" + SRC_URI = "${GPE_SVN} \ file://removeblue-fontsize8.patch;patch=1" diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb index 87b7dc090d..a1f576f069 100644 --- a/packages/gsm/libgsmd_svn.bb +++ b/packages/gsm/libgsmd_svn.bb @@ -3,8 +3,10 @@ HOMEPAGE = "http://www.openmoko.org" LICENSE = "GPL LGPL" SECTION = "libs/gsm" PROVIDES += "gsmd" -PV = "0.1+svn${SRCDATE}" -PR = "r16" +PV = "0.1+svnr${SRCREV}" +PR = "r17" + +SRC_URI_OVERRIDES_PACKAGE_ARCH = "1" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ file://gsmd \ diff --git a/packages/gtk-webcore/midori_0.0.4.bb b/packages/gtk-webcore/midori_0.0.4.bb new file mode 100644 index 0000000000..47c7fe123b --- /dev/null +++ b/packages/gtk-webcore/midori_0.0.4.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Midori is a lightweight web browser." +LICENSE = "GPLv2" + +DEPENDS = "webkit libsexy" + +inherit autotools pkgconfig + +SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz" + + + diff --git a/packages/hsetroot/.mtn2git_empty b/packages/hsetroot/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/hsetroot/.mtn2git_empty diff --git a/packages/hsetroot/files/.mtn2git_empty b/packages/hsetroot/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/hsetroot/files/.mtn2git_empty diff --git a/packages/hsetroot/files/pkgconfigize-imlib.patch b/packages/hsetroot/files/pkgconfigize-imlib.patch new file mode 100644 index 0000000000..862b74fad2 --- /dev/null +++ b/packages/hsetroot/files/pkgconfigize-imlib.patch @@ -0,0 +1,22 @@ +Index: hsetroot-1.0.2/configure.ac +=================================================================== +--- hsetroot-1.0.2.orig/configure.ac 2003-09-05 21:41:38.000000000 +0000 ++++ hsetroot-1.0.2/configure.ac 2007-08-09 21:14:09.000000000 +0000 +@@ -39,16 +39,7 @@ + AC_C_CONST + + # Check for imlib2 +-AC_CHECK_PROGS(imlib2config_cmd, imlib2-config) +-if test x$imlib2config_cmd = "x"; then +- AC_MSG_ERROR([error. Imlib2 is required to compile.]) +-fi +- +-IMLIB2_CFLAGS=`$imlib2config_cmd --cflags` +-AC_SUBST(IMLIB2_CFLAGS) +- +-IMLIB2_LIBS=`$imlib2config_cmd --libs` +-AC_SUBST(IMLIB2_LIBS) ++PKG_CHECK_MODULES(IMLIB2, imlib2) + + # Some extra definitions for config.h + AC_DEFINE(DESCRIPTION, "yet another wallpaper application", [single line package description]) diff --git a/packages/hsetroot/hsetroot_1.0.2.bb b/packages/hsetroot/hsetroot_1.0.2.bb new file mode 100644 index 0000000000..64ff997b50 --- /dev/null +++ b/packages/hsetroot/hsetroot_1.0.2.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "Yet another X Wallpaper Utility" +DEPENDS += "imlib2 freetype zlib virtual/libx11 libxext" +RDEPENDS += "imlib2-loaders" +LICENSE = "GPL" + +SRC_URI = "http://thegraveyard.org/files/hsetroot-${PV}.tar.gz \ + file://pkgconfigize-imlib.patch;patch=1" + +inherit autotools + diff --git a/packages/musicpd/mpc_0.11.2.bb b/packages/musicpd/mpc_0.11.2.bb deleted file mode 100644 index 8d3eaa183a..0000000000 --- a/packages/musicpd/mpc_0.11.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "Command-line (scriptable) Music Player Daemon (mpd) Client" -HOMEPAGE = "http://www.musicpd.org/mpc.shtml" -SECTION = "console/multimedia" -LICENSE = "GPLv2" -PR = "r1" - -SRC_URI = "http://mercury.chem.pitt.edu/~shank/mpc-${PV}.tar.gz" -EXTRA_OECONF = "--with-iconv-libraries=${STAGING_LIBDIR} \ - --with-iconv-includes=${STAGING_INCDIR}" - -inherit autotools diff --git a/packages/musicpd/mpc_0.12.0.bb b/packages/musicpd/mpc_0.12.1.bb index ccd6926fcd..ccd6926fcd 100644 --- a/packages/musicpd/mpc_0.12.0.bb +++ b/packages/musicpd/mpc_0.12.1.bb diff --git a/packages/musicpd/mpd_0.11.2.bb b/packages/musicpd/mpd_0.11.2.bb deleted file mode 100644 index 9d3c5f90b0..0000000000 --- a/packages/musicpd/mpd_0.11.2.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Music Player Daemon (mpd)" -HOMEPAGE = "http://www.musicpd.org" -SECTION = "console/multimedia" -LICENSE = "GPLv2" -DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile" -PR = "r2" - -SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz" - -inherit autotools - -# Setting --enable-mpd-{mad,id3tag} causes local caches of the libraries to -# be built, instead we use the OE built versions which should be installed -# in staging - remove the --with and replace with --enable to use the local -# versions. - -EXTRA_OECONF = "--enable-ogg \ - --with-id3tag-libraries=${STAGING_LIBDIR} \ - --with-id3tag-includes=${STAGING_INCDIR} \ - --with-mad-libraries=${STAGING_LIBDIR} \ - --with-mad-includes=${STAGING_INCDIR} \ - --without-faad" diff --git a/packages/musicpd/mpd_0.11.5.bb b/packages/musicpd/mpd_0.11.5.bb deleted file mode 100644 index 7a1d17ef5d..0000000000 --- a/packages/musicpd/mpd_0.11.5.bb +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION = "Music Player Daemon (mpd)" -HOMEPAGE = "http://www.musicpd.org" -SECTION = "console/multimedia" -LICENSE = "GPLv2" -DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv faad2" -PR = "r8" - -SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz \ - file://save-volume-state.patch;patch=1" - -inherit autotools - -# Setting --enable-mpd-{mad,id3tag} causes local caches of the libraries to -# be built, instead we use the OE built versions which should be installed -# in staging - remove the --with and replace with --enable to use the local -# versions. - -EXTRA_OECONF = "--enable-ogg \ - --with-iconv-libraries=${STAGING_LIBDIR} \ - --with-iconv-includes=${STAGING_INCDIR} \ - --with-vorbis-libraries=${STAGING_LIBDIR} \ - --with-vorbis-includes=${STAGING_INCDIR} \ - --with-ogg-libraries=${STAGING_LIBDIR} \ - --with-ogg-includes=${STAGING_INCDIR} \ - --with-ao-libraries=${STAGING_LIBDIR} \ - --with-ao-includes=${STAGING_INCDIR} \ - --with-id3tag-libraries=${STAGING_LIBDIR} \ - --with-id3tag-includes=${STAGING_INCDIR} \ - --with-mad-libraries=${STAGING_LIBDIR} \ - --with-mad-includes=${STAGING_INCDIR} \ - --with-faad-libraries=${STAGING_LIBDIR} \ - --with-faad-includes=${STAGING_INCDIR}" diff --git a/packages/musicpd/mpd_svn.bb b/packages/musicpd/mpd_svn.bb index 04ddf8fdc3..673ff03b98 100644 --- a/packages/musicpd/mpd_svn.bb +++ b/packages/musicpd/mpd_svn.bb @@ -3,23 +3,24 @@ HOMEPAGE = "http://www.musicpd.org" SECTION = "console/multimedia" LICENSE = "GPLv2" DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv faad2 pulseaudio" -SRCDATE = "20070120" PV = "0.12.1+svn${SRCDATE}" -PR = "r2" +PR = "r0" SRC_URI = "svn://svn.musicpd.org/mpd;module=trunk;proto=https \ - file://fix-mod-support.patch;patch=1;maxdate=20070302" + file://mpd/mpd.init" # file://save-volume-state.patch;patch=1" S = "${WORKDIR}/trunk" -inherit autotools +inherit autotools update-rc.d +INITSCRIPT_NAME = "mpd" # Setting --enable-mpd-{mad,id3tag} causes local caches of the libraries to # be built, instead we use the OE built versions which should be installed # in staging - remove the --with and replace with --enable to use the local # versions. -EXTRA_OECONF = "--enable-ogg \ +EXTRA_OECONF = "\ + --enable-ogg \ --with-id3tag-libraries=${STAGING_LIBDIR} \ --with-id3tag-includes=${STAGING_INCDIR} \ --with-mad-libraries=${STAGING_LIBDIR} \ diff --git a/packages/ncurses/ncurses.inc b/packages/ncurses/ncurses.inc index 030cd1034c..027f037ee5 100644 --- a/packages/ncurses/ncurses.inc +++ b/packages/ncurses/ncurses.inc @@ -41,6 +41,10 @@ do_stage() { ln -sf libncurses.a ${STAGING_LIBDIR}/libtermcap.a } +# This is necessary so that the "tic" command executed during the install can +# link with the correct libary in staging. +export LD_LIBRARY_PATH = "${STAGING_LIBDIR_NATIVE}" + do_install() { autotools_do_install diff --git a/packages/ncurses/ncurses_5.4.bb b/packages/ncurses/ncurses_5.4.bb index 63272b4779..6da32232af 100644 --- a/packages/ncurses/ncurses_5.4.bb +++ b/packages/ncurses/ncurses_5.4.bb @@ -1,4 +1,4 @@ -PR = "r8" +PR = "r9" SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \ file://visibility.patch;patch=1" diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb index 6851ae8d9a..6775008ea5 100644 --- a/packages/netbase/netbase_4.21.bb +++ b/packages/netbase/netbase_4.21.bb @@ -2,10 +2,12 @@ DESCRIPTION = "This package provides the necessary \ infrastructure for basic TCP/IP based networking." SECTION = "base" LICENSE = "GPL" -PR = "r18" +PR = "r20" inherit update-rc.d +SRC_URI_OVERRIDES_PACKAGE_ARCH = "1" + INITSCRIPT_NAME = "networking" INITSCRIPT_PARAMS = "start 40 S . stop 40 0 6 1 ." # On MNCI etc, start very late so that our own apps come up faster diff --git a/packages/openmoko2/neod_svn.bb b/packages/openmoko2/neod_svn.bb index 6eb8241d18..4d6115ae93 100644 --- a/packages/openmoko2/neod_svn.bb +++ b/packages/openmoko2/neod_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Simple Neo1973 Daemon for Button Handling and Power Management" SECTION = "openmoko/daemons" -DEPENDS = "gtk+ pulseaudio" +DEPENDS = "gconf gtk+ pulseaudio" PV = "0.1.0+svn${SVNREV}" PR = "r0" diff --git a/packages/openmoko2/openmoko-common2_svn.bb b/packages/openmoko2/openmoko-common2_svn.bb new file mode 100644 index 0000000000..f54a23de18 --- /dev/null +++ b/packages/openmoko2/openmoko-common2_svn.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Common files for the OpenMoko distribution" +SECTION = "openmoko/base" +PV = "0.0+svn${SRCDATE}" +PR = "r3" + +inherit openmoko2 + +SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=pixmaps;proto=http" +S = "${WORKDIR}" + +dirs = "pixmaps" + +do_install() { + find ${WORKDIR} -name ".svn" | xargs rm -rf + install -d ${D}${datadir} + for i in ${dirs}; do + cp -fpPR ${S}/$i ${D}${datadir} + done +} + +PACKAGE_ARCH = "all" +FILES_${PN} = "${datadir}" diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index 86e1485003..046f59b3d9 100644 --- a/packages/openmoko2/openmoko-session2.bb +++ b/packages/openmoko2/openmoko-session2.bb @@ -1,9 +1,10 @@ -DESCRIPTION = "Custom MB session files for poky" +DESCRIPTION = "Custom MB session files for OpenMoko" LICENSE = "GPL" SECTION = "x11" RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2" +RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2" RCONFLICTS = "openmoko-session" -PR = "r23" +PR = "r29" SRC_URI = "file://etc" S = ${WORKDIR} @@ -25,4 +26,8 @@ gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --dire gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme openmoko-standard gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 5" gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/poky/peripherals/mouse/drag_threshold 8 +gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/openmoko/neod/power_management 2 + } + +PACKAGE_ARCH = "all" diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/session b/packages/openmoko2/openmoko-session2/etc/matchbox/session index 60ce553f67..b2867047b1 100755 --- a/packages/openmoko2/openmoko-session2/etc/matchbox/session +++ b/packages/openmoko2/openmoko-session2/etc/matchbox/session @@ -1,5 +1,4 @@ #!/bin/sh - SHOWCURSOR="no" openmoko-today & @@ -7,5 +6,7 @@ openmoko-dialer & matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ & -exec matchbox-panel-2 --start-applets showdesktop,systray,startup \ - --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock --titlebar +matchbox-panel-2 --start-applets systray,startup \ + --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock --titlebar & + +exec neod diff --git a/packages/openmoko2/openmoko-terminal2_1.0.0.bb b/packages/openmoko2/openmoko-terminal2_1.0.0.bb index 8d9a5245ca..84bd470f7a 100644 --- a/packages/openmoko2/openmoko-terminal2_1.0.0.bb +++ b/packages/openmoko2/openmoko-terminal2_1.0.0.bb @@ -1,7 +1,10 @@ DESCRIPTION = "The OpenMoko Command Line Console" SECTION = "openmoko/applications" RDEPENDS += "mrxvt" -PR = "r1" +PR = "r2" + +RCONFLICTS = "openmoko-terminal" +RREPLACES = "openmoko-terminal" inherit openmoko2 diff --git a/packages/openmoko2/openmoko-today2-folders_svn.bb b/packages/openmoko2/openmoko-today2-folders_svn.bb new file mode 100644 index 0000000000..7a7c90c091 --- /dev/null +++ b/packages/openmoko2/openmoko-today2-folders_svn.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "The OpenMoko Today2 vfolder files" +SECTION = "openmoko/misc" +PV = "0.1.0+svn${SVNREV}" +PR = "r1" + +inherit openmoko2 + +FILES_${PN} += "${datadir}" diff --git a/packages/openmoko2/openmoko-today2_svn.bb b/packages/openmoko2/openmoko-today2_svn.bb index 93e0b47456..bfc5fc201d 100644 --- a/packages/openmoko2/openmoko-today2_svn.bb +++ b/packages/openmoko2/openmoko-today2_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The OpenMoko Application Launcher" SECTION = "openmoko/pim" DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm" -RDEPENDS = "libedata-cal" +RDEPENDS = "libedata-cal openmoko-today2-folders" PV = "0.1.0+svn${SVNREV}" PR = "r1" diff --git a/packages/openssh/openssh-4.6p1/.mtn2git_empty b/packages/openssh/openssh-4.6p1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/openssh/openssh-4.6p1/.mtn2git_empty diff --git a/packages/openssh/openssh-4.6p1/ssh_config b/packages/openssh/openssh-4.6p1/ssh_config new file mode 100644 index 0000000000..ad26d09b7c --- /dev/null +++ b/packages/openssh/openssh-4.6p1/ssh_config @@ -0,0 +1,39 @@ +# $OpenBSD: ssh_config,v 1.16 2002/07/03 14:21:05 markus Exp $ + +# This is the ssh client system-wide configuration file. See +# ssh_config(5) for more information. This file provides defaults for +# users, and the values can be changed in per-user configuration files +# or on the command line. + +# Configuration data is parsed as follows: +# 1. command line options +# 2. user-specific file +# 3. system-wide file +# Any configuration value is only changed the first time it is set. +# Thus, host-specific definitions should be at the beginning of the +# configuration file, and defaults at the end. + +# Site-wide defaults for various options + +# Host * +# ForwardAgent no +# ForwardX11 no +# RhostsAuthentication no +# RhostsRSAAuthentication no +# RSAAuthentication yes +# PasswordAuthentication yes +# HostbasedAuthentication no +# BatchMode no +# CheckHostIP yes +# StrictHostKeyChecking ask +# IdentityFile ~/.ssh/identity +# IdentityFile ~/.ssh/id_rsa +# IdentityFile ~/.ssh/id_dsa +# Port 22 +# Protocol 2,1 +# Cipher 3des +# Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc +# EscapeChar ~ +Host * + ForwardAgent yes + ForwardX11 yes diff --git a/packages/openssh/openssh-4.6p1/sshd_config b/packages/openssh/openssh-4.6p1/sshd_config new file mode 100644 index 0000000000..8c1069d9a6 --- /dev/null +++ b/packages/openssh/openssh-4.6p1/sshd_config @@ -0,0 +1,96 @@ +# $OpenBSD: sshd_config,v 1.59 2002/09/25 11:17:16 markus Exp $ + +# This is the sshd server system-wide configuration file. See +# sshd_config(5) for more information. + +# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin + +# The strategy used for options in the default sshd_config shipped with +# OpenSSH is to specify options with their default value where +# possible, but leave them commented. Uncommented options change a +# default value. + +#Port 22 +Protocol 2 +#ListenAddress 0.0.0.0 +#ListenAddress :: + +# HostKey for protocol version 1 +#HostKey /etc/ssh/ssh_host_key +# HostKeys for protocol version 2 +#HostKey /etc/ssh/ssh_host_rsa_key +#HostKey /etc/ssh/ssh_host_dsa_key + +# Lifetime and size of ephemeral version 1 server key +#KeyRegenerationInterval 3600 +#ServerKeyBits 768 + +# Logging +#obsoletes QuietMode and FascistLogging +#SyslogFacility AUTH +#LogLevel INFO + +# Authentication: + +#LoginGraceTime 120 +#PermitRootLogin yes +#StrictModes yes + +#RSAAuthentication yes +#PubkeyAuthentication yes +#AuthorizedKeysFile .ssh/authorized_keys + +# rhosts authentication should not be used +#RhostsAuthentication no +# Don't read the user's ~/.rhosts and ~/.shosts files +#IgnoreRhosts yes +# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts +#RhostsRSAAuthentication no +# similar for protocol version 2 +#HostbasedAuthentication no +# Change to yes if you don't trust ~/.ssh/known_hosts for +# RhostsRSAAuthentication and HostbasedAuthentication +#IgnoreUserKnownHosts no + +# To disable tunneled clear text passwords, change to no here! +#PasswordAuthentication yes +#PermitEmptyPasswords no + +# Change to no to disable s/key passwords +#ChallengeResponseAuthentication yes + +# Kerberos options +#KerberosAuthentication no +#KerberosOrLocalPasswd yes +#KerberosTicketCleanup yes + +#AFSTokenPassing no + +# Kerberos TGT Passing only works with the AFS kaserver +#KerberosTgtPassing no + +# Set this to 'yes' to enable PAM keyboard-interactive authentication +# Warning: enabling this may bypass the setting of 'PasswordAuthentication' +#PAMAuthenticationViaKbdInt no + +#X11Forwarding no +#X11DisplayOffset 10 +#X11UseLocalhost yes +#PrintMotd yes +#PrintLastLog yes +#KeepAlive yes +#UseLogin no +UsePrivilegeSeparation yes +#PermitUserEnvironment no +Compression no + +#MaxStartups 10 +# no default banner path +#Banner /some/path +#VerifyReverseMapping no + +ClientAliveInterval 15 +ClientAliveCountMax 4 + +# override default of no subsystems +Subsystem sftp /usr/libexec/sftp-server diff --git a/packages/openssh/openssh_4.6p1.bb b/packages/openssh/openssh_4.6p1.bb new file mode 100644 index 0000000000..e5dfaff77d --- /dev/null +++ b/packages/openssh/openssh_4.6p1.bb @@ -0,0 +1,111 @@ +DEFAULT_PREFERENCE = "-1" + +DEPENDS = "zlib openssl" + +RCONFLICTS_openssh = "dropbear" +RCONFLICTS_openssh-sshd = "dropbear" + +SECTION = "console/network" +DESCRIPTION = "Secure rlogin/rsh/rcp/telnet replacement (OpenSSH) \ +Ssh (Secure Shell) is a program for logging into a remote machine \ +and for executing commands on a remote machine. \ +It provides secure encrypted communications between two untrusted \ +hosts over an insecure network. X11 connections and arbitrary TCP/IP \ +ports can also be forwarded over the secure channel. \ +It is intended as a replacement for rlogin, rsh and rcp, and can be \ +used to provide applications with a secure communication channel." +HOMEPAGE = "http://www.openssh.org/" +LICENSE = "BSD" +PR = "r1" + +SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \ + file://sshd_config \ + file://ssh_config \ + file://init" + +inherit autotools + +export ASKPASS_PROGRAM = "${bindir}/ssh-askpass" +export LD = "${CC}" +CFLAGS_prepend = "-I${S} " +CFLAGS_append = " -D__FILE_OFFSET_BITS=64" +LDFLAGS_prepend = "-L${S} -L${S}/openbsd-compat " +EXTRA_OECONF = "--disable-suid-ssh --with-ssl=${STAGING_LIBDIR}/ssl \ + --with-rand-helper=no --without-pam \ + --without-zlib-version-check \ + --with-privsep-path=/var/run/sshd \ + --sysconfdir=${sysconfdir}/ssh \ + --with-xauth=/usr/bin/xauth" + +EXTRA_OEMAKE = "'STRIP_OPT='" + +do_configure_prepend () { + if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then + cp aclocal.m4 acinclude.m4 + fi +} + +do_compile_append () { + install -m 0644 ${WORKDIR}/sshd_config ${S}/ + install -m 0644 ${WORKDIR}/ssh_config ${S}/ +} + +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-dbg +=${bindir}/.debug ${libdir}exec/.debug" +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" +FILES_openssh-misc = "${bindir}/ssh* ${libdir}exec/ssh*" + +RDEPENDS_openssh += " openssh-scp openssh-ssh openssh-sshd" +DEPENDS_openssh-sshd += " update-rc.d" +RDEPENDS_openssh-sshd += " update-rc.d" + +pkg_postinst_openssh-sshd() { +if test "x$D" != "x"; then + exit 1 +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 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-ssh() { + update-alternatives --remove ${bindir}/ssh ssh.${PN} +} + +pkg_postrm_openssh-scp() { + update-alternatives --remove ${bindir}/scp scp.${PN} +} + +pkg_postrm_openssh-sshd() { +if test "x$D" != "x"; then + exit 1 +else + ${sysconfdir}/init.d/sshd stop + deluser sshd + delgroup sshd + update-rc.d -f sshd remove +fi +} + +CONFFILES_openssh-sshd = "${sysconfdir}/ssh/sshd_config" +CONFFILES_openssh-ssh = "${sysconfdir}/ssh/ssh_config" diff --git a/packages/opie-bluetoothapplet/files/sysconfig-bluetooth.patch b/packages/opie-bluetoothapplet/files/sysconfig-bluetooth.patch deleted file mode 100644 index 83ee765b12..0000000000 --- a/packages/opie-bluetoothapplet/files/sysconfig-bluetooth.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- applet.org/bluezapplet.cpp.org 2007-02-11 16:48:06.000000000 +0000 -+++ applet/bluezapplet.cpp 2007-02-11 16:56:57.000000000 +0000 -@@ -52,6 +52,8 @@ - #include <qtimer.h> - #include <qpopupmenu.h> - #include <qmessagebox.h> -+#include <qfile.h> -+#include <qtextstream.h> - - /* STD */ - #include <device.h> -@@ -124,6 +126,28 @@ - int BluezApplet::setBluezStatus(int c, bool sync) { - - if ( c == 1 ) { -+ -+ QFile cfg("/etc/sysconfig/bluetooth"); -+ if(cfg.open(IO_ReadOnly)) { -+ QTextStream stream (&cfg); -+ QString streamIn = stream.read(); -+ QStringList list = QStringList::split("\n", streamIn); -+ cfg.close(); -+ if(list.grep("BLUETOOTH_PORT=").count() > 0 && -+ list.grep("BLUETOOTH_PROTOCOL=").count() > 0 && -+ list.grep("BLUETOOTH_SPEED=").count() > 0) { -+ btDevice = new Device( list.grep("BLUETOOTH_PORT=")[0]. -+ replace((QString)"BLUETOOTH_PORT=", ""), -+ list.grep("BLUETOOTH_PROTOCOL=")[0]. -+ replace((QString)"BLUETOOTH_PROTOCOL=", ""), -+ list.grep("BLUETOOTH_SPEED=")[0]. -+ replace((QString)"BLUETOOTH_SPEED=", "")); -+ return 0; -+ } -+ } -+ -+ // Device-specific stuff - should be removed -+ - switch ( ODevice::inst()->model() ) { - case Model_iPAQ_H39xx: - btDevice = new Device( "/dev/tts/1", "bcsp", "921600" ); diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.3.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.3.bb index f35accf577..f54012285d 100644 --- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.3.bb +++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.3.bb @@ -4,5 +4,3 @@ PR = "r0" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/applet \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics/bluetoothapplet" - -# file://sysconfig-bluetooth.patch;patch=1" diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb index a919c3094b..04756ed77a 100644 --- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb +++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb @@ -4,5 +4,4 @@ PV = "${OPIE_CVS_PV}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/applet \ - ${HANDHELDS_CVS};module=opie/pics/bluetoothapplet \ - file://sysconfig-bluetooth.patch;patch=1" + ${HANDHELDS_CVS};module=opie/pics/bluetoothapplet" diff --git a/packages/poppler/poppler-data_0.1.bb b/packages/poppler/poppler-data_0.1.bb index ca22e4dba0..e145cb07ee 100644 --- a/packages/poppler/poppler-data_0.1.bb +++ b/packages/poppler/poppler-data_0.1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base." LICENSE = "Adobe" -PR = "r0" +PR = "r1" SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz" diff --git a/packages/poppler/poppler.inc b/packages/poppler/poppler.inc index e01057cb4e..0e9b61cd30 100644 --- a/packages/poppler/poppler.inc +++ b/packages/poppler/poppler.inc @@ -21,3 +21,8 @@ EXTRA_OECONF += "${@get_poppler_fpu_setting(bb, d)}" do_stage() { autotools_stage_all } + +PACKAGES =+ "libpoppler libpoppler-glib" +FILES_libpoppler = "${libdir}/libpoppler.so.*" +FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*" + diff --git a/packages/poppler/poppler/.mtn2git_empty b/packages/poppler/poppler/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/poppler/poppler/.mtn2git_empty diff --git a/packages/poppler/poppler/fix-splash.patch b/packages/poppler/poppler/fix-splash.patch new file mode 100644 index 0000000000..001c4ce301 --- /dev/null +++ b/packages/poppler/poppler/fix-splash.patch @@ -0,0 +1,28 @@ +--- poppler/splash/SplashMath.h 2007/04/25 19:59:10 1.3 ++++ poppler/splash/SplashMath.h 2007/06/01 18:34:48 1.4 +@@ -8,7 +8,7 @@ + #define SPLASHMATH_H + + #if USE_FIXEDPOINT +-#include "FixedPoint.h" ++#include "goo/FixedPoint.h" + #else + #include <math.h> + #endif +--- poppler/splash/SplashFTFont.cc 2007/04/25 19:59:10 1.8 ++++ poppler/splash/SplashFTFont.cc 2007/06/01 18:34:48 1.9 +@@ -127,10 +127,10 @@ + matrix.yx = (FT_Fixed)((mat[1] / size).getRaw()); + matrix.xy = (FT_Fixed)((mat[2] / size).getRaw()); + matrix.yy = (FT_Fixed)((mat[3] / size).getRaw()); +- textMatrix.xx = (FT_Fixed)((textMat[0] / (size * textScale)).getRaw()); +- textMatrix.yx = (FT_Fixed)((textMat[1] / (size * textScale)).getRaw()); +- textMatrix.xy = (FT_Fixed)((textMat[2] / (size * textScale)).getRaw()); +- textMatrix.yy = (FT_Fixed)((textMat[3] / (size * textScale)).getRaw()); ++ textMatrix.xx = (FT_Fixed)((textMat[0] / (textScale * size)).getRaw()); ++ textMatrix.yx = (FT_Fixed)((textMat[1] / (textScale * size)).getRaw()); ++ textMatrix.xy = (FT_Fixed)((textMat[2] / (textScale * size)).getRaw()); ++ textMatrix.yy = (FT_Fixed)((textMat[3] / (textScale * size)).getRaw()); + #else + matrix.xx = (FT_Fixed)((mat[0] / size) * 65536); + matrix.yx = (FT_Fixed)((mat[1] / size) * 65536); diff --git a/packages/poppler/poppler0.6_cvs.bb b/packages/poppler/poppler0.6_cvs.bb index ca4b8d6a03..15f94a775a 100644 --- a/packages/poppler/poppler0.6_cvs.bb +++ b/packages/poppler/poppler0.6_cvs.bb @@ -1,6 +1,6 @@ require poppler.inc PV = "0.5.9+cvs${SRCDATE}" -PR = "r0" +PR = "r1" SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/poppler;module=poppler" S = "${WORKDIR}/poppler" diff --git a/packages/poppler/poppler_0.5.4.bb b/packages/poppler/poppler_0.5.4.bb index 92c25bc0ac..754eccf435 100644 --- a/packages/poppler/poppler_0.5.4.bb +++ b/packages/poppler/poppler_0.5.4.bb @@ -1,2 +1,2 @@ require poppler.inc -PR = "r2" +PR = "r3" diff --git a/packages/poppler/poppler_0.5.9.bb b/packages/poppler/poppler_0.5.9.bb index 347d9ae303..2fc2200afc 100644 --- a/packages/poppler/poppler_0.5.9.bb +++ b/packages/poppler/poppler_0.5.9.bb @@ -1,5 +1,7 @@ require poppler.inc -# does not build, use cvs for now and eventually try to bump to 0.6.0 (or 1.0) -DEFAULT_PREFERENCE = "-1" +PR = "r1" + +SRC_URI += "file://fix-splash.patch;patch=1" +EXTRA_OECONF_append = " --disable-abiword-output " diff --git a/packages/pulseaudio/pulse.inc b/packages/pulseaudio/pulse.inc index 0158a8a9cc..f765bec1a1 100644 --- a/packages/pulseaudio/pulse.inc +++ b/packages/pulseaudio/pulse.inc @@ -27,6 +27,11 @@ PARALLEL_MAKE = "" export TARGET_PFPU = "${TARGET_FPU}" +# TODO: Use more fine granular version +#OE_LT_RPATH_ALLOW=":${libdir}/pulse-0.9:" +OE_LT_RPATH_ALLOW = "any" +OE_LT_RPATH_ALLOW[export]="1" + do_stage() { autotools_stage_all } @@ -65,28 +70,25 @@ FILES_${PN}-gconf-helper = "${libexecdir}/pulse/gconf-helper" FILES_${PN}-misc = "${bindir}/*" CONFFILES_pulseaudio-server = "\ - ${sysconfdir}/pulse/default.pa \ - ${sysconfdir}/pulse/daemon.conf \ - ${sysconfdir}/pulse/client.conf \ - " -pkg_postinst_libppulse() { -if test "x$D" != "x"; then - exit 1 -else + ${sysconfdir}/pulse/default.pa \ + ${sysconfdir}/pulse/daemon.conf \ + ${sysconfdir}/pulse/client.conf \ + " + +pkg_postinst_${PN}-server() { + # can't do this offline + if [ "x$D" != "x" ]; then + exit 1 + fi grep -q pulse: /etc/group || addgroup pulse grep -q pulse: /etc/passwd || \ - adduser --disabled-password --home=/var/run/pulse/ --system \ + adduser --disabled-password --home=/var/run/pulse --system \ --ingroup pulse --no-create-home -g "Pulse audio daemon" pulse /etc/init.d/populate-volatile.sh update -fi } -pkg_postrm_libpulse() { -if test "x$D" != "x"; then - exit 1 -else - deluser pulse -fi +pkg_postrm_${PN}-server() { + deluser pulse || true } python populate_packages_prepend() { diff --git a/packages/pulseaudio/pulseaudio_0.9.5.bb b/packages/pulseaudio/pulseaudio_0.9.5.bb deleted file mode 100644 index 63c33c4725..0000000000 --- a/packages/pulseaudio/pulseaudio_0.9.5.bb +++ /dev/null @@ -1,3 +0,0 @@ -require pulse.inc - -PR = "r11" diff --git a/packages/pulseaudio/pulseaudio_0.9.6.bb b/packages/pulseaudio/pulseaudio_0.9.6.bb index fd64673cc7..a93c8ee251 100644 --- a/packages/pulseaudio/pulseaudio_0.9.6.bb +++ b/packages/pulseaudio/pulseaudio_0.9.6.bb @@ -1,4 +1,4 @@ require pulse.inc -PR = "r3" +PR = "r5" diff --git a/packages/slugimage/slugimage.bb b/packages/slugimage/slugimage.bb index 16873d8d24..ad05d54851 100644 --- a/packages/slugimage/slugimage.bb +++ b/packages/slugimage/slugimage.bb @@ -3,11 +3,11 @@ SECTION = "console/utils" LICENSE = "BSD" DESCRIPTION = "Slugimage is a small app to disassemble and reassemble \ flash images for the Linksys NSLU2 device. It also has jffs2 support" -PR = "r10" +PR = "r11" RDEPENDS = "perl" -SLUGIMAGE_SVN_REV ?= "82" +SLUGIMAGE_SVN_REV ?= "103" SLUGIMAGE_SVN_REPO ?= "http://svn.nslu2-linux.org/svnroot/slugimage/trunk" addtask svnfetch before do_configure after do_patch diff --git a/packages/sysconf/sysconf_0.1.bb b/packages/sysconf/sysconf_0.1.bb index e6bb3f29bb..608868f197 100644 --- a/packages/sysconf/sysconf_0.1.bb +++ b/packages/sysconf/sysconf_0.1.bb @@ -3,7 +3,7 @@ SECTION = "base" PRIORITY = "optional" LICENSE = "GPL" RDEPENDS = "devio cpio findutils diffutils" -PR = "r9" +PR = "r10" # Currently, the scripts only support ixp4xx machines. # Feel free to add to the scripts ... @@ -48,5 +48,3 @@ pkg_postrm() { test -n "$D" && opt="-r $D" update-rc.d $opt sysconfsetup remove } - -CONFFILES = "${sysconfdir}/default/conffiles" diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb index 21f1b551f5..07457c52c7 100644 --- a/packages/tasks/task-slugos.bb +++ b/packages/tasks/task-slugos.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Task packages for the SlugOS distribution" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r13" +PR = "r14" PACKAGE_ARCH = "${MACHINE_ARCH}" ALLOW_EMPTY = "1" @@ -28,7 +28,7 @@ SLUGOS_STANDARD_RRECOMMENDS = "" # udev is the default way of handling devices, there is no guarantee # that the static device table is completely correct (it is just # known to be sufficient for boot.) -SLUGOS_STANDARD_RRECOMMENDS += "diffutils cpio findutils udev" +SLUGOS_STANDARD_RRECOMMENDS += "diffutils cpio findutils" # These lines add support for formatting ext2 and ext3 file systems # on a hard disk attached to the NSLU2. ext3 is the standard Linux @@ -62,10 +62,6 @@ kernel-module-ext2 \ kernel-module-jbd \ kernel-module-ext3 \ kernel-module-vfat \ -kernel-module-isofs \ -kernel-module-udf \ -kernel-module-nfs \ -kernel-module-loop \ kernel-module-nls-cp437 \ kernel-module-nls-utf8 \ " @@ -85,10 +81,8 @@ kernel-module-uhci-hcd \ " # Add modules required for IDE support -SLUGOS_STANDARD_RRECOMMENDS += "\ -kernel-module-libata \ -kernel-module-pata-artop \ -" +# SLUGOS_STANDARD_RRECOMMENDS += "\ +# " # Add modules required for Network support SLUGOS_STANDARD_RRECOMMENDS += "\ @@ -98,28 +92,18 @@ kernel-module-ixp4xx-qmgr \ kernel-module-via-velocity \ " -# Add modules required for Wifi support -SLUGOS_STANDARD_RRECOMMENDS += "\ -madwifi-ng-modules madwifi-ng-tools wireless-tools \ -" - -## Other wireless tools that should be considered -## should space be available in the rootfs +# portmap \ +# kexec-tools \ +# kernel-module-nfs \ +# kernel-module-isofs \ +# kernel-module-udf \ +# kernel-module-loop \ +# kernel-module-libata \ +# kernel-module-pata-artop \ +# kernel-module-netconsole \ # wpa-supplicant \ # zd1211-firmware kernel-module-zd1211rw \ - -# Add kexec tools for rebooting alternate kernels -SLUGOS_STANDARD_RRECOMMENDS += "\ -kexec-tools \ -" - -# Add modules required for Network Console support -# NOTE: This module is desirable for systems lacking a physical -# console, but is usually only enabled if specific needs or issues -# arise. If space in the flash is at a premium, it can be omitted. -SLUGOS_STANDARD_RRECOMMENDS += "\ -kernel-module-netconsole \ -" +# madwifi-ng-modules madwifi-ng-tools wireless-tools \ DISTRO_EXTRA_DEPENDS ?= "" DEPENDS += "${DISTRO_EXTRA_DEPENDS}" @@ -129,10 +113,9 @@ RDEPENDS += "\ kernel ixp4xx-npe \ base-files base-passwd netbase \ busybox initscripts-slugos slugos-init \ - update-modules sysvinit tinylogin \ + update-modules sysvinit tinylogin udev \ module-init-tools modutils-initscripts \ ipkg-collateral ipkg ipkg-link \ - portmap \ beep \ e2fsprogs-blkid \ util-linux-mount \ @@ -143,6 +126,6 @@ RDEPENDS += "\ ${DISTRO_EXTRA_RDEPENDS}" RRECOMMENDS += "\ - dropbear \ + openssh \ ${SLUGOS_STANDARD_RRECOMMENDS} \ ${DISTRO_EXTRA_RRECOMMENDS}" diff --git a/packages/xorg-app/xsetroot_1.0.1.bb b/packages/xorg-app/xsetroot_1.0.1.bb new file mode 100644 index 0000000000..0f63feb79f --- /dev/null +++ b/packages/xorg-app/xsetroot_1.0.1.bb @@ -0,0 +1,6 @@ +require xorg-app-common.inc + +DESCRIPTION = "Sets the visual appearance of the X root window" +LICENSE = "MIT" +DEPENDS += "libxmu xbitmaps" +PE = "1" diff --git a/packages/xorg-data/xbitmaps_1.0.1.bb b/packages/xorg-data/xbitmaps_1.0.1.bb new file mode 100644 index 0000000000..7d9dc18c84 --- /dev/null +++ b/packages/xorg-data/xbitmaps_1.0.1.bb @@ -0,0 +1,6 @@ +require xorg-data-common.inc + +DESCRIPTION = "Common X11 Bitmaps" +LICENSE = "MIT" +DEPENDS += "libxmu xbitmaps" + diff --git a/packages/xorg-data/xorg-data-common.inc b/packages/xorg-data/xorg-data-common.inc index 9b236c852f..46b14d73af 100644 --- a/packages/xorg-data/xorg-data-common.inc +++ b/packages/xorg-data/xorg-data-common.inc @@ -1,15 +1,14 @@ -DESCRIPTION = "X data files" HOMEPAGE = "http://www.x.org" -SECTION = "x11/datas" +SECTION = "x11/data" LICENSE = "MIT-X" -#DEPENDS = "" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/data/${XORG_PN}-${PV}.tar.bz2" + +SRC_URI = "${XORG_MIRROR}/individual/data/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig do_stage() { - autotools_stage_all + autotools_stage_all } diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate b/packages/xserver-kdrive-common/xserver-kdrive-common/30xTs_Calibrate index 8e6a8b22cb..8e6a8b22cb 100644 --- a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate +++ b/packages/xserver-kdrive-common/xserver-kdrive-common/30xTs_Calibrate diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/60xXDefaults b/packages/xserver-kdrive-common/xserver-kdrive-common/60xXDefaults index d3a284d8da..d3a284d8da 100644 --- a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/60xXDefaults +++ b/packages/xserver-kdrive-common/xserver-kdrive-common/60xXDefaults diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager b/packages/xserver-kdrive-common/xserver-kdrive-common/90xXWindowManager index b2b65a0993..b2b65a0993 100644 --- a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager +++ b/packages/xserver-kdrive-common/xserver-kdrive-common/90xXWindowManager diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xdefaults b/packages/xserver-kdrive-common/xserver-kdrive-common/Xdefaults index f5b69dd516..f5b69dd516 100644 --- a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xdefaults +++ b/packages/xserver-kdrive-common/xserver-kdrive-common/Xdefaults diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit b/packages/xserver-kdrive-common/xserver-kdrive-common/Xinit index f566ffe5be..f566ffe5be 100644 --- a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit +++ b/packages/xserver-kdrive-common/xserver-kdrive-common/Xinit diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver new file mode 100644 index 0000000000..709d501dfc --- /dev/null +++ b/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver @@ -0,0 +1,114 @@ +#!/bin/sh +# + +# note xinit needs full server path +XSERVER=/usr/bin/Xipaq +if [ -f /usr/bin/Xfbdev ]; then + XSERVER=/usr/bin/Xfbdev +fi +if [ -f /usr/bin/Xepson ]; then + XSERVER=/usr/bin/Xepson +fi +if [ -f /usr/bin/Xorg ]; then + XSERVER=/usr/bin/Xorg +fi +if [ -f /usr/bin/Xomap ]; then + XSERVER=/usr/bin/Xomap +fi +if [ -f /usr/bin/Xw100 ]; then + XSERVER=Xw100 +fi +if [ -f /usr/bin/Ximageon ]; then + XSERVER=Ximageon +fi + +. /etc/profile + + + +fallback_screen_arg() { + geom=`fbset | grep geometry` + w=`echo $geom | awk '{ print $2 }'` + h=`echo $geom | awk '{ print $3 }'` + b=`echo $geom | awk '{ print $6 }'` + echo -n "${w}x${h}x${b}" +} + +module_id() { + ## used to read from assets, but sometimes assets is corrupted + # grep "Module ID" /proc/hal/assets | sed "s/.*://" + ## used to read from /proc/hal/model, but that is removed in 2.6 + # echo ' iPAQ' `cat /proc/hal/model` + awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo +} + +export USER=root + +ARGS=" -br -pn" + +# use ucb 1x00 touchscreen if present +if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then + ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00" +fi + +# use usb mouse if present +# Xorg doesn't support "-mouse" option, and uses /dev/input/mice automatically +if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ]; then + ARGS="$ARGS -mouse /dev/input/mice" +fi + +# start off server in conventional location. +case `module_id` in + "HP iPAQ H3100" | "HP iPAQ H3800") + ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@90" ;; + "HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900") + ARGS="$ARGS -dpi 100 -rgba vbgr -screen 320x240@270" ;; + "HP iPAQ H5400" | "HP iPAQ H2200") + ARGS="$ARGS -dpi 100 -rgba rgb" ;; + "HP iPAQ HX4700") + ARGS="$ARGS -dpi 200" ;; + "Ramses") + # What is this "vt2" in aid of? + ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@90 vt2" ;; + # both 'Sharp-Collie' and just 'Collie' have been reported + *Poodle) + ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@270" ;; + *Collie) + ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@270" + ;; + "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") + ARGS="$ARGS -dpi 200 -rgba rgb" ;; + "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi") + ARGS="$ARGS -dpi 200 -rgba rgb -screen 480x640@270" ;; + "Simpad") + ARGS="$ARGS -dpi 100 -rgba rgb" ;; + "Generic OMAP1510/1610/1710") + ARGS="$ARGS -dpi 220 -mouse /dev/input/event0" ;; + "Cellon C8000 Board") + ARGS="$ARGS -dpi 100 -screen 240x320,10,1" ;; + "HTC Magician") + ARGS="$ARGS -dpi 142" ;; + "HTC Universal") + ARGS="$ARGS -dpi 225 -screen 480x640@270" ;; + "ARM-IntegratorCP" | "ARM-Versatile PB") + ARGS="$ARGS -rgba vrgb" ;; + "Compulab CM-x270") + modprobe mbxfb + ARGS="$ARGS -fb /dev/fb1" + ;; + "GTA01") + ARGS="$ARGS -dpi 285 -screen 480x640" ;; + "Nokia N800") + ARGS="$ARGS -dpi 225 -screen 800x480x16 -mouse tslib" ;; + *) + # Its a device we dont know about - in which case force + # kdrive to use the current framebuffer geometry otherwise + # it will defualt to trying to achieve 1024x768 + S=`fallback_screen_arg` + ARGS="$ARGS -screen $S" + ;; +esac + +DISPLAY=':0' + +exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $* diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession b/packages/xserver-kdrive-common/xserver-kdrive-common/Xsession index a438e13050..a438e13050 100644 --- a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession +++ b/packages/xserver-kdrive-common/xserver-kdrive-common/Xsession diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver deleted file mode 100644 index e59460f3b0..0000000000 --- a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/sh -# - -# note xinit needs full server path -XSERVER=/usr/bin/Xipaq -if [ -f /usr/bin/Xfbdev ]; then - XSERVER=/usr/bin/Xfbdev -fi -if [ -f /usr/bin/Xepson ]; then - XSERVER=/usr/bin/Xepson -fi -if [ -f /usr/bin/Xorg ]; then - XSERVER=/usr/bin/Xorg -fi -if [ -f /usr/bin/Xomap ]; then - XSERVER=/usr/bin/Xomap -fi -if [ -f /usr/bin/Xw100 ]; then - XSERVER=Xw100 -fi -if [ -f /usr/bin/Ximageon ]; then - XSERVER=Ximageon -fi - -. /etc/profile - - - -fallback_screen_arg() { - geom=`fbset | grep geometry` - w=`echo $geom | awk '{ print $2 }'` - h=`echo $geom | awk '{ print $3 }'` - b=`echo $geom | awk '{ print $6 }'` - echo -n "${w}x${h}x${b}" -} - -module_id() { - ## used to read from assets, but sometimes assets is corrupted - # grep "Module ID" /proc/hal/assets | sed "s/.*://" - ## used to read from /proc/hal/model, but that is removed in 2.6 - # echo ' iPAQ' `cat /proc/hal/model` - awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo -} - -export USER=root - -ARGS=" -br -pn" - -# use ucb 1x00 touchscreen if present -if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then - ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00" -fi - -# use usb mouse if present -# Xorg doesn't support "-mouse" option, and uses /dev/input/mice automatically -if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ]; then - ARGS="$ARGS -mouse /dev/input/mice" -fi - -# start off server in conventional location. -case `module_id` in - "HP iPAQ H3100" | "HP iPAQ H3800") - ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@90" ;; - "HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900") - ARGS="$ARGS -dpi 100 -rgba vbgr -screen 320x240@270" ;; - "HP iPAQ H5400" | "HP iPAQ H2200") - ARGS="$ARGS -dpi 100 -rgba rgb" ;; - "HP iPAQ HX4700") - ARGS="$ARGS -dpi 200" ;; - "Ramses") - # What is this "vt2" in aid of? - ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@90 vt2" ;; - # both 'Sharp-Collie' and just 'Collie' have been reported - *Poodle) - ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@270" ;; - *Collie) - ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@270" - ;; - "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") - ARGS="$ARGS -dpi 200 -rgba rgb" ;; - "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi") - ARGS="$ARGS -dpi 200 -rgba rgb -screen 480x640@270" ;; - "Simpad") - ARGS="$ARGS -dpi 100 -rgba rgb" ;; - "Generic OMAP1510/1610/1710") - ARGS="$ARGS -dpi 220 -mouse /dev/input/event0" ;; - "Cellon C8000 Board") - ARGS="$ARGS -dpi 100 -screen 240x320,10,1" ;; - "HTC Universal") - ARGS="$ARGS -dpi 225 -screen 480x640@270" ;; - "ARM-IntegratorCP" | "ARM-Versatile PB") - ARGS="$ARGS -rgba vrgb" ;; - "Compulab CM-x270") - modprobe mbxfb - ARGS="$ARGS -fb /dev/fb1" - ;; - "GTA01") - ARGS="$ARGS -dpi 285 -screen 480x640" ;; - "Nokia N800") - ARGS="$ARGS -dpi 225 -screen 800x480x16 -mouse tslib" ;; - *) - # Its a device we dont know about - in which case force - # kdrive to use the current framebuffer geometry otherwise - # it will defualt to trying to achieve 1024x768 - S=`fallback_screen_arg` - ARGS="$ARGS -screen $S" - ;; -esac - -DISPLAY=':0' - -exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $* diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/.mtn2git_empty b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/.mtn2git_empty diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver new file mode 100644 index 0000000000..dddced4b6f --- /dev/null +++ b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver @@ -0,0 +1,114 @@ +#!/bin/sh +# + +# note xinit needs full server path +XSERVER=/usr/bin/Xipaq +if [ -f /usr/bin/Xfbdev ]; then + XSERVER=/usr/bin/Xfbdev +fi +if [ -f /usr/bin/Xepson ]; then + XSERVER=/usr/bin/Xepson +fi +if [ -f /usr/bin/Xorg ]; then + XSERVER=/usr/bin/Xorg +fi +if [ -f /usr/bin/Xomap ]; then + XSERVER=/usr/bin/Xomap +fi +if [ -f /usr/bin/Xw100 ]; then + XSERVER=Xw100 +fi +if [ -f /usr/bin/Ximageon ]; then + XSERVER=Ximageon +fi + +. /etc/profile + + + +fallback_screen_arg() { + geom=`fbset | grep geometry` + w=`echo $geom | awk '{ print $2 }'` + h=`echo $geom | awk '{ print $3 }'` + b=`echo $geom | awk '{ print $6 }'` + echo -n "${w}x${h}x${b}" +} + +module_id() { + ## used to read from assets, but sometimes assets is corrupted + # grep "Module ID" /proc/hal/assets | sed "s/.*://" + ## used to read from /proc/hal/model, but that is removed in 2.6 + # echo ' iPAQ' `cat /proc/hal/model` + awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo +} + +export USER=root + +ARGS=" -pn" + +# use ucb 1x00 touchscreen if present +if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then + ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00" +fi + +# use usb mouse if present +# Xorg doesn't support "-mouse" option, and uses /dev/input/mice automatically +if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ]; then + ARGS="$ARGS -mouse /dev/input/mice" +fi + +# start off server in conventional location. +case `module_id` in + "HP iPAQ H3100" | "HP iPAQ H3800") + ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@90" ;; + "HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900") + ARGS="$ARGS -br -dpi 100 -rgba vbgr -screen 320x240@270" ;; + "HP iPAQ H5400" | "HP iPAQ H2200") + ARGS="$ARGS -br -dpi 100 -rgba rgb" ;; + "HP iPAQ HX4700") + ARGS="$ARGS -br -dpi 200" ;; + "Ramses") + # What is this "vt2" in aid of? + ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@90 vt2" ;; + # both 'Sharp-Collie' and just 'Collie' have been reported + *Poodle) + ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@270" ;; + *Collie) + ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@270" + ;; + "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") + ARGS="$ARGS -br -dpi 200 -rgba rgb" ;; + "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi") + ARGS="$ARGS -br -dpi 200 -rgba rgb -screen 480x640@270" ;; + "Simpad") + ARGS="$ARGS -br -dpi 100 -rgba rgb" ;; + "Generic OMAP1510/1610/1710") + ARGS="$ARGS -br -dpi 220 -mouse /dev/input/event0" ;; + "Cellon C8000 Board") + ARGS="$ARGS -br -dpi 100 -screen 240x320,10,1" ;; + "HTC Magician") + ARGS="$ARGS -br -dpi 142" ;; + "HTC Universal") + ARGS="$ARGS -br -dpi 225 -screen 480x640@270" ;; + "ARM-IntegratorCP" | "ARM-Versatile PB") + ARGS="$ARGS -br -rgba vrgb" ;; + "Compulab CM-x270") + modprobe mbxfb + ARGS="$ARGS -br -fb /dev/fb1" + ;; + "GTA01" | "GTA02") + ARGS="$ARGS -dpi 285 -screen 480x640 -hide-cursor -root-ppm /usr/share/pixmaps/xsplash.ppm" ;; + "Nokia N800") + ARGS="$ARGS -br -dpi 225 -screen 800x480x16 -mouse tslib" ;; + *) + # Its a device we dont know about - in which case force + # kdrive to use the current framebuffer geometry otherwise + # it will defualt to trying to achieve 1024x768 + S=`fallback_screen_arg` + ARGS="$ARGS -screen $S" + ;; +esac + +DISPLAY=':0' + +exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $* diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb index 9d9b577766..cb3cf4578f 100644 --- a/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb +++ b/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb @@ -2,17 +2,41 @@ DESCRIPTION = "Common X11 scripts" LICENSE = "GPL" SECTION = "x11" RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit" -PR = "r14" +PR = "r17" -SRC_URI = "file://etc" -S = ${WORKDIR} +SRC_URI = "\ + file://Xdefaults \ + file://Xinit \ + file://Xserver \ + file://Xsession \ + \ + file://30xTs_Calibrate \ + file://60xXDefaults \ + file://90xXWindowManager \ + " + +etcFiles = "\ + Xdefaults \ + Xinit \ + Xserver \ + Xsession \ + " +sessionFiles = "\ + 30xTs_Calibrate \ + 60xXDefaults \ + 90xXWindowManager \ + " + +S = "${WORKDIR}" PACKAGE_ARCH = "all" do_install() { - cp -R ${S}/etc ${D}/etc - rm -fR ${D}/etc/.svn - rm -fR ${D}/etc/*/.svn - rm -fR ${D}/etc/*/*/.svn - chmod -R 755 ${D}/etc + install -d ${D}/${sysconfdir}/X11/Xsession.d + for i in ${etcFiles}; do + install -m 0755 ${WORKDIR}/$i ${D}/${sysconfdir}/X11/ + done + for i in ${sessionFiles}; do + install -m 0755 ${WORKDIR}/$i ${D}/${sysconfdir}/X11/Xsession.d/ + done } |