From a2ad4d5b600449a953ae2dc5cb042aa2942115c5 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Thu, 9 Feb 2006 21:45:24 +0000 Subject: gpe-bootsplash: Use update-alternatives to install pictures Added: gpe-bootsplash-theme-e --- .../gpe-bootsplash/files/splash-e-landscape.svg | 536 ++++++++++++++++++++ .../gpe-bootsplash/files/splash-e-portrait.svg | 556 +++++++++++++++++++++ packages/gpe-bootsplash/gpe-bootsplash-theme-e.bb | 32 ++ packages/gpe-bootsplash/gpe-bootsplash_1.15.bb | 16 +- 4 files changed, 1137 insertions(+), 3 deletions(-) create mode 100644 packages/gpe-bootsplash/files/splash-e-landscape.svg create mode 100644 packages/gpe-bootsplash/files/splash-e-portrait.svg create mode 100644 packages/gpe-bootsplash/gpe-bootsplash-theme-e.bb diff --git a/packages/gpe-bootsplash/files/splash-e-landscape.svg b/packages/gpe-bootsplash/files/splash-e-landscape.svg new file mode 100644 index 0000000000..0685d475e0 --- /dev/null +++ b/packages/gpe-bootsplash/files/splash-e-landscape.svg @@ -0,0 +1,536 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/gpe-bootsplash/files/splash-e-portrait.svg b/packages/gpe-bootsplash/files/splash-e-portrait.svg new file mode 100644 index 0000000000..ca0ad0893a --- /dev/null +++ b/packages/gpe-bootsplash/files/splash-e-portrait.svg @@ -0,0 +1,556 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/gpe-bootsplash/gpe-bootsplash-theme-e.bb b/packages/gpe-bootsplash/gpe-bootsplash-theme-e.bb new file mode 100644 index 0000000000..e95c09b3e8 --- /dev/null +++ b/packages/gpe-bootsplash/gpe-bootsplash-theme-e.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "An Enlightenment theme for gpe-bootsplash" +SECTION = "base" +PRIORITY = "optional" +MAINTAINER = "Matthias 'CoreDump' Hentges " +LICENSE = "GPL" + +DEPENDS = "gpe-bootsplash" +RDEPENDS = "gpe-bootsplash" + +PR = "r0" + +export THEME = "e" + +SRC_URI = "file://*.svg" + +FILES_${PN} = "/usr/share/gpe/splash-${THEME}-*" + + +do_install(){ + install -d "${D}/usr/share/gpe" + install -m 0644 ${WORKDIR}/splash-${THEME}* ${D}/usr/share/gpe +} + +pkg_postinst() { + update-alternatives --install /usr/share/gpe/splash-l.svg bootsplash-l /usr/share/gpe/splash-${THEME}-landscape.svg 20 + update-alternatives --install /usr/share/gpe/splash-p.svg bootsplash-p /usr/share/gpe/splash-${THEME}-portrait.svg 20 +} + +pkg_postrm() { + update-alternatives --remove bootsplash-l /usr/share/gpe/splash-${THEME}-landscape.svg + update-alternatives --remove bootsplash-p /usr/share/gpe/splash-${THEME}-portrait.svg +} diff --git a/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb b/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb index 2e5f18b11f..1e25bfd1ab 100644 --- a/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb +++ b/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb @@ -5,15 +5,25 @@ MAINTAINER = "Phil Blundell " SECTION = "gpe" PRIORITY = "optional" LICENSE = "GPL" -PR = "r0" +PR = "r1" SRC_URI += "file://splash-p.svg file://splash-l.svg" FILES_${PN} += "${datadir}/gpe" do_install_append() { - install -m 0644 ${WORKDIR}/splash-p.svg ${D}${datadir}/gpe/splash-p.svg - install -m 0644 ${WORKDIR}/splash-l.svg ${D}${datadir}/gpe/splash-l.svg + install -m 0644 ${WORKDIR}/splash-p.svg ${D}${datadir}/gpe/splash-gpe-portrait.svg + install -m 0644 ${WORKDIR}/splash-l.svg ${D}${datadir}/gpe/splash-gpe-landscape.svg mv ${D}${sysconfdir}/rcS.d/S00bootsplash ${D}${sysconfdir}/rcS.d/S07bootsplash } +pkg_postinst() { + + update-alternatives --install /usr/share/gpe/splash-l.svg bootsplash-l /usr/share/gpe/splash-gpe-landscape.svg 10 + update-alternatives --install /usr/share/gpe/splash-p.svg bootsplash-p /usr/share/gpe/splash-gpe-portrait.svg 10 +} + +pkg_postrm() { + update-alternatives --remove bootsplash-l /usr/share/gpe/splash-gpe-landscape.svg + update-alternatives --remove bootsplash-p /usr/share/gpe/splash-gpe-portrait.svg +} -- cgit v1.2.3 From 60fef3d1ffdacab6895a854c439b7723ca75cd52 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 9 Feb 2006 22:11:59 +0000 Subject: xserver-common: Remove invalid DEPENDS and set PACKAGE_ARCH = all --- packages/xserver-common/xserver-common_1.3.bb | 4 +++- packages/xserver-common/xserver-common_1.5.bb | 4 ++-- packages/xserver-common/xserver-common_1.7.bb | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/xserver-common/xserver-common_1.3.bb b/packages/xserver-common/xserver-common_1.3.bb index 343abe9258..ea3fab6654 100644 --- a/packages/xserver-common/xserver-common_1.3.bb +++ b/packages/xserver-common/xserver-common_1.3.bb @@ -2,8 +2,10 @@ MAINTAINER = "Florian Boor " DESCRIPTION = "Common X11 scripts and support files" LICENSE = "GPL" SECTION = "x11" -DEPENDS = "xmodmap xrandr xdpyinfo xtscal" RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" +PR = "r1" + +PACKAGE_ARCH = "all" # we are using a gpe-style Makefile inherit gpe diff --git a/packages/xserver-common/xserver-common_1.5.bb b/packages/xserver-common/xserver-common_1.5.bb index a825ddf6de..f6d09ac9e1 100644 --- a/packages/xserver-common/xserver-common_1.5.bb +++ b/packages/xserver-common/xserver-common_1.5.bb @@ -2,10 +2,10 @@ MAINTAINER = "Florian Boor " DESCRIPTION = "Common X11 scripts and support files" LICENSE = "GPL" SECTION = "x11" -DEPENDS = "xmodmap xrandr xdpyinfo xtscal" RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" -PR = "r0" +PR = "r1" +PACKAGE_ARCH = "all" # we are using a gpe-style Makefile inherit gpe diff --git a/packages/xserver-common/xserver-common_1.7.bb b/packages/xserver-common/xserver-common_1.7.bb index a825ddf6de..f6d09ac9e1 100644 --- a/packages/xserver-common/xserver-common_1.7.bb +++ b/packages/xserver-common/xserver-common_1.7.bb @@ -2,10 +2,10 @@ MAINTAINER = "Florian Boor " DESCRIPTION = "Common X11 scripts and support files" LICENSE = "GPL" SECTION = "x11" -DEPENDS = "xmodmap xrandr xdpyinfo xtscal" RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" -PR = "r0" +PR = "r1" +PACKAGE_ARCH = "all" # we are using a gpe-style Makefile inherit gpe -- cgit v1.2.3 From 635e2fc4dea3f146d4cc52a0d0e7c10dc02f6fed Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 9 Feb 2006 22:12:45 +0000 Subject: lsof 4.75: Update SRC_URI --- packages/lsof/lsof_4.75.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/lsof/lsof_4.75.bb b/packages/lsof/lsof_4.75.bb index 7c1bba3b6c..0562a57fb1 100644 --- a/packages/lsof/lsof_4.75.bb +++ b/packages/lsof/lsof_4.75.bb @@ -4,7 +4,7 @@ tool. Its name stands for LiSt Open Files, and it \ does just that." LICENSE = "BSD" -SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.bz2" +SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/lsof_${PV}.tar.bz2" LOCALSRC = "file://${WORKDIR}/lsof_${PV}/lsof_${PV}_src.tar" S = "${WORKDIR}/lsof_${PV}_src" -- cgit v1.2.3 From 7d32b0e77e05ca432b7a476c30783ed6e20b7139 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 9 Feb 2006 22:19:59 +0000 Subject: linux-oz-2.6: From now on refer to patches within the archive directory. --- packages/linux/linux-openzaurus.inc | 2 +- packages/linux/linux-openzaurus_2.6.15.bb | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc index 2fc6f58007..8403965269 100644 --- a/packages/linux/linux-openzaurus.inc +++ b/packages/linux/linux-openzaurus.inc @@ -6,7 +6,7 @@ PROVIDES = "virtual/kernel-hostap" RPROVIDES = "virtual/kernel-hostap" DOSRC = "http://www.do13.de/openzaurus/patches" -RPSRC = "http://www.rpsys.net/openzaurus/patches" +RPSRC = "http://www.rpsys.net/openzaurus/patches/archive" JLSRC = "http://www.cs.wisc.edu/~lenz/zaurus/files" BASRC = "http://www.orca.cx/zaurus/patches" diff --git a/packages/linux/linux-openzaurus_2.6.15.bb b/packages/linux/linux-openzaurus_2.6.15.bb index b42f101f50..3eae7cbc84 100644 --- a/packages/linux/linux-openzaurus_2.6.15.bb +++ b/packages/linux/linux-openzaurus_2.6.15.bb @@ -44,20 +44,20 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \ ${RPSRC}/input_power-r4.patch;patch=1 \ ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \ ${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \ - ${RPSRC}/ipaq/hx2750_base-r24.patch;patch=1 \ - ${RPSRC}/ipaq/hx2750_bl-r4.patch;patch=1 \ - ${RPSRC}/ipaq/hx2750_pcmcia-r2.patch;patch=1 \ - ${RPSRC}/ipaq/pxa_keys-r5.patch;patch=1 \ - ${RPSRC}/ipaq/tsc2101-r12.patch;patch=1 \ - ${RPSRC}/ipaq/hx2750_test1-r3.patch;patch=1 \ + ${RPSRC}/hx2750_base-r24.patch;patch=1 \ + ${RPSRC}/hx2750_bl-r4.patch;patch=1 \ + ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \ + ${RPSRC}/pxa_keys-r5.patch;patch=1 \ + ${RPSRC}/tsc2101-r12.patch;patch=1 \ + ${RPSRC}/hx2750_test1-r3.patch;patch=1 \ ${DOSRC}/tc6393-device-r8.patch;patch=1 \ ${DOSRC}/tc6393_nand-r7.patch;patch=1 \ ${DOSRC}/tosa-keyboard-r9.patch;patch=1 \ - ${RPSRC}/temp/tosa-pxaac97-r5-rp.patch;patch=1 \ - ${RPSRC}/temp/tosa-tc6393-r1-rp.patch;patch=1 \ - ${RPSRC}/temp/tosa-power-r9-rp.patch;patch=1 \ + ${RPSRC}/tosa-pxaac97-r5-rp.patch;patch=1 \ + ${RPSRC}/tosa-tc6393-r1-rp.patch;patch=1 \ + ${RPSRC}/tosa-power-r9-rp.patch;patch=1 \ ${DOSRC}/tc6393fb-r9.patch;patch=1 \ - ${RPSRC}/temp/tosa-lcd-r6-rp.patch;patch=1 \ + ${RPSRC}/tosa-lcd-r6-rp.patch;patch=1 \ ${DOSRC}/tosa-bl-r9.patch;patch=1 \ ${DOSRC}/tosa-bluetooth-r2.patch;patch=1 \ ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ @@ -77,7 +77,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \ ${DOSRC}/kexec-arm-r0.patch \ file://add-oz-release-string.patch;patch=1 \ file://pxa-serial-hack.patch;patch=1 \ - ${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \ + ${RPSRC}/pxa-linking-bug.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ file://connectplus-remove-ide-HACK.patch;patch=1 \ file://defconfig-c7x0 \ -- cgit v1.2.3 From 61f4daf30071a9044ca3cb15933598ead0dbdda4 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Thu, 9 Feb 2006 23:15:31 +0000 Subject: efl.bbclass: use += for PACKAGES to allow setting of PACKAGES before inheriting --- classes/efl.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/efl.bbclass b/classes/efl.bbclass index b438ca61b4..7f218f2e79 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -73,7 +73,7 @@ do_stage_append () { fi } -PACKAGES = "${SRCNAME} ${SRCNAME}-themes ${SRCNAME}-dev ${SRCNAME}-examples" +PACKAGES += "${SRCNAME} ${SRCNAME}-themes ${SRCNAME}-dev ${SRCNAME}-examples" FILES_${SRCNAME} = "${libdir}/lib*.so*" FILES_${SRCNAME}-themes = "${datadir}/${SRCNAME}/themes ${datadir}/${SRCNAME}/data ${datadir}/${SRCNAME}/fonts ${datadir}/${SRCNAME}/pointers ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/users ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/styles" FILES_${SRCNAME}-dev += "${bindir}/${SRCNAME}-config ${libdir}/pkgconfig ${libdir}/lib*.?a ${datadir}/${SRCNAME}/include" -- cgit v1.2.3 From 6a6f53ff8b242d9e8c065b2a9a38d0e2e35b0bf8 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Thu, 9 Feb 2006 23:20:51 +0000 Subject: preferred-e-versions: Add PREFERRED_PROVIDERS for evas, ecore, and imlib2 for x11 --- conf/distro/preferred-e-versions.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/distro/preferred-e-versions.inc b/conf/distro/preferred-e-versions.inc index e4571f1ae6..f59d32ba1c 100644 --- a/conf/distro/preferred-e-versions.inc +++ b/conf/distro/preferred-e-versions.inc @@ -25,3 +25,7 @@ PREFERRED_VERSION_imlib2-x11 = "1.2.1.010" PREFERRED_VERSION_imlib2-native = "1.2.1.010" PREFERRED_VERSION_e-wm = "0.16.999.023" PREFERRED_VERSION_entrance = "0.9.0.005" + +PREFERRED_PROVIDER_virtual/evas = "evas-x11" +PREFERRED_PROVIDER_virtual/ecore = "ecore-x11" +PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11" -- cgit v1.2.3 From 227ce7837904625d26e7f09ec46e352994e630ec Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Thu, 9 Feb 2006 23:25:55 +0000 Subject: edje: move binaries to edje-utils package from edje-dev --- packages/efl/edje_0.5.0.023.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/efl/edje_0.5.0.023.bb b/packages/efl/edje_0.5.0.023.bb index 9315639af2..eb90478799 100644 --- a/packages/efl/edje_0.5.0.023.bb +++ b/packages/efl/edje_0.5.0.023.bb @@ -2,7 +2,11 @@ DESCRIPTION = "Edje is a complex graphical design & layout library." # can also install vim data files DEPENDS = "virtual/evas virtual/ecore eet embryo edje-native virtual/imlib2" LICENSE = "MIT" -PR = "r1" +PR = "r2" + +PACKAGES += "edje-utils" +FILES_edje-utils += "${bindir}" +RDEPENDS_edje-utils += "cpp" inherit efl @@ -10,10 +14,6 @@ SRC_URI += "cvs://anonymous@thinktux.net/root;module=e17/libs/edje/m4;date=20060 LEAD_SONAME = "libedje.so" -FILES_${PN}-dev += "${bindir}" - -RDEPENDS_${PN}-dev += "cpp" - do_configure_prepend() { install -d "${S}/m4" install "${WORKDIR}/m4/"*.m4 "${S}/m4" -- cgit v1.2.3 From b37b732cd782699dd3b146c182f202905734bb24 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Thu, 9 Feb 2006 23:31:08 +0000 Subject: e17-gpe-menu-convert: add a new package to convert GPE .desktop files into an e17 menu --- packages/e17/e17-gpe-menu-convert/.mtn2git_empty | 0 .../e17-gpe-menu-convert/e17-gpe-menu-convert.sh | 144 +++++++++++++++++++++ packages/e17/e17-gpe-menu-convert_0.2.bb | 18 +++ 3 files changed, 162 insertions(+) create mode 100644 packages/e17/e17-gpe-menu-convert/.mtn2git_empty create mode 100644 packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh create mode 100644 packages/e17/e17-gpe-menu-convert_0.2.bb diff --git a/packages/e17/e17-gpe-menu-convert/.mtn2git_empty b/packages/e17/e17-gpe-menu-convert/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh b/packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh new file mode 100644 index 0000000000..cf144272ec --- /dev/null +++ b/packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh @@ -0,0 +1,144 @@ +#!/bin/sh + +setVar() { + if [ ! "$value" = "" ]; then + name=`echo "$name" | sed 'y:-\[\]:_____:'` + value=`echo "$value" | sed 's:":\\\":g'` + export $name="$value" + fi +} + +#convert true/false to 1/0 +bool() { + if [ ! "$1" = "" ]; then + if [ "$1" = "True" ]; then + cmd="$cmd $2 1" + else + cmd="$cmd $2 0" + fi + fi +} + +str() { + if [ ! "$1" = "" ]; then + cmd="$cmd $2 \"$1"\" + fi +} + +convert_desktop_to_eap() { + echo "Converting $1 to $2" + for l in `cat $1`; do + #on empty line clear vars + if [ "$l" = "" ]; then + + #grab previous var if it exists + setVar + + name="" + value="" + else + #if an = is in the line it's a name/value pair + if echo "$l" | grep -q "="; then + + #grab previous var if it exists + setVar + + name=`echo "$l" | cut -d "=" -f 1` + value=`echo "$l" | cut -d "=" -f 2-` + else + + #if previous value assume this is a continuation + if [ ! "$value" = "" ]; then + value="$value $l" + fi + fi + fi + done + setVar + + cmd="" + + #set up options + bool "$StartupNotify" -set-startup-notify + str "$Name" -set-name + str "$Comment" -set-comment + str "$Exec" -set-exe + + if [ ! "$cmd" = "" ]; then + #cp ~/.e/e/applications/all/aterm.eap gpe-othello.eap + ##empty out eap file + ##enlightenment_eapp | grep -- -set- | cut -d " " -f 3 | xargs -iCMD enlightenment_eapp gpe-othello.eap CMD \"\" + #enlightenment_eapp gpe-othello.eap -del-all + + cat < /tmp/gpeEap.edc +images { + image: "$Icon" COMP; +} +collections { + group { + name: "icon"; + max: 48 48; + parts { + part { + name: "image"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + image.normal: "$Icon"; + } + } + } + } +} +EOF + + edje_cc --image_dir /usr/share/pixmaps /tmp/gpeEap.edc "$PATH_TO_EAP/$2" + rm /tmp/gpeEap.edc + + cmd="enlightenment_eapp \"$PATH_TO_EAP/$2\" $cmd" + + #pipe command in sh to allow it to re-interpret quotes + echo $cmd | /bin/sh -s + + if `echo "$Categories" | grep -q "SystemSettings"`; then + dir="Settings" + elif `echo "$Categories" | grep -q "PIM"`; then + dir="PIM" + elif `echo "$Categories" | grep -q "Network"`; then + dir="Network" + elif `echo "$Categories" | grep -q "Games"`; then + dir="Games" + elif `echo "$Categories" | grep -q "Game"`; then + dir="Games" + elif `echo "$Categories" | grep -q "AudioVideo"`; then + dir="Multimedia" + elif `echo "$Categories" | grep -q "Panel"`; then + dir="Utility/Panel" + elif `echo "$Categories" | grep -q "Utility"`; then + dir="Utlity" + else + dir="" + fi + + #dir=`echo "$Categories" | sed 'y:;:/:'` + mkdir -p "$PATH_TO_E_GPE/$dir" + echo "$2" >> "$PATH_TO_E_GPE/$dir"/.order + fi +} + +PATH_TO_DESKTOP="${IMAGE_ROOTFS}/usr/share/applications" +PATH_TO_EAP="${IMAGE_ROOTFS}/home/root/.e/e/applications/all" +PATH_TO_E_GPE="${IMAGE_ROOTFS}/home/root/.e/e/applications/favorite/GPE" + +if [ ! -d $PATH_TO_E_GPE ]; then + mkdir -p $PATH_TO_E_GPE +fi +if [ ! -d $PATH_TO_EAP ]; then + mkdir -p $PATH_TO_EAP +fi +cd "$PATH_TO_DESKTOP" +for f in `ls *.desktop`; do + eap=`echo "$f" | cut -d . -f 1` + convert_desktop_to_eap "$PATH_TO_DESKTOP/$f" "$eap.eap" +done diff --git a/packages/e17/e17-gpe-menu-convert_0.2.bb b/packages/e17/e17-gpe-menu-convert_0.2.bb new file mode 100644 index 0000000000..b83cba6209 --- /dev/null +++ b/packages/e17/e17-gpe-menu-convert_0.2.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Shell script to convert GPE .desktop files into e17 eap files and menus" +DEPENDS = "edje e-wm" +RDEPENDS += "edje-utils e-wm" +LICENSE = "MIT" +SECTION = "e/apps" +MAINTAINER = "Justin Patrin " +PR = "r0" + +SRC_URI = "file://e17-gpe-menu-convert.sh" + +do_install() { + install -d ${D}/usr/bin/ + install -m 755 ${WORKDIR}/e17-gpe-menu-convert.sh ${D}/usr/bin/e17-gpe-menu-convert.sh +} + +pkg_postinst() { + /usr/bin/e17-gpe-menu-convert.sh 2>&1 > /tmp/gpe-menu-convert.log +} \ No newline at end of file -- cgit v1.2.3 From 3713ad47fd338aa55e62aa19794f911f70de5fbf Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Thu, 9 Feb 2006 23:35:05 +0000 Subject: e-image: add e17-gpe-menu-convert to installed packages - NOTE: This adds a dep on cpp and edje-utils which will make the image larger --- packages/meta/e-image.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/meta/e-image.bb b/packages/meta/e-image.bb index fffcfb1be2..caac207fb7 100644 --- a/packages/meta/e-image.bb +++ b/packages/meta/e-image.bb @@ -1,7 +1,6 @@ -DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager and Tools" -PR = "r4" - include e-image-core.bb +DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager and Tools" +PR = "r5" export IMAGE_BASENAME = "e-image" export IPKG_INSTALL += "task-e-x11-core \ @@ -15,7 +14,8 @@ export IPKG_INSTALL += "task-e-x11-core \ xhost \ gpe-soundserver \ gpe-confd \ - xauth" + xauth \ + e17-gpe-menu-convert" DEPENDS += "task-e-x11-core task-gpe" -- cgit v1.2.3 From 228a0608e28d9fdab32e228e05ca3e28094ffc85 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Thu, 9 Feb 2006 23:53:09 +0000 Subject: edje: move template and include directories to edje-utils, move files in -themes to -examples --- packages/efl/edje_0.5.0.023.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/efl/edje_0.5.0.023.bb b/packages/efl/edje_0.5.0.023.bb index eb90478799..9b4a6c9a3f 100644 --- a/packages/efl/edje_0.5.0.023.bb +++ b/packages/efl/edje_0.5.0.023.bb @@ -2,14 +2,16 @@ DESCRIPTION = "Edje is a complex graphical design & layout library." # can also install vim data files DEPENDS = "virtual/evas virtual/ecore eet embryo edje-native virtual/imlib2" LICENSE = "MIT" -PR = "r2" +PR = "r3" PACKAGES += "edje-utils" -FILES_edje-utils += "${bindir}" +FILES_edje-utils += "${bindir} ${datadir}/edje/data/template ${datadir}/edje/include" RDEPENDS_edje-utils += "cpp" inherit efl +FILES_${SRCNAME}-themes = "" + SRC_URI += "cvs://anonymous@thinktux.net/root;module=e17/libs/edje/m4;date=20060101" LEAD_SONAME = "libedje.so" -- cgit v1.2.3 From af9f9fb7e189d02921a4787d3d57698a9e0f1292 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Fri, 10 Feb 2006 00:45:43 +0000 Subject: embryo: split out binaries into embryo-utils --- packages/efl/embryo_0.9.1.023.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/efl/embryo_0.9.1.023.bb b/packages/efl/embryo_0.9.1.023.bb index 1802da1bca..8a9b5cab40 100644 --- a/packages/efl/embryo_0.9.1.023.bb +++ b/packages/efl/embryo_0.9.1.023.bb @@ -4,6 +4,9 @@ CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999. \ Embryo allows scripting capabilities in places that otherwise wouldn't support \ basic programming structures such as in Edje EDCs." LICENSE = "MIT" -PR = "r1" +PR = "r2" + +PACKAGES = "embryo-utils embryo-dev" +FILES_embryo-utils = "${bindir}/embryo ${bindir}/embryo_* ${datadir}/embryo/include" inherit efl -- cgit v1.2.3 From 8dab3a0eb79930fd5b7f758ca8607867c1013054 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Fri, 10 Feb 2006 00:46:02 +0000 Subject: edje: Remove unneeded files from edje-utils, add dependency on embryo-utils --- packages/efl/edje_0.5.0.023.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/efl/edje_0.5.0.023.bb b/packages/efl/edje_0.5.0.023.bb index 9b4a6c9a3f..bc27ae5370 100644 --- a/packages/efl/edje_0.5.0.023.bb +++ b/packages/efl/edje_0.5.0.023.bb @@ -2,11 +2,11 @@ DESCRIPTION = "Edje is a complex graphical design & layout library." # can also install vim data files DEPENDS = "virtual/evas virtual/ecore eet embryo edje-native virtual/imlib2" LICENSE = "MIT" -PR = "r3" +PR = "r4" -PACKAGES += "edje-utils" -FILES_edje-utils += "${bindir} ${datadir}/edje/data/template ${datadir}/edje/include" -RDEPENDS_edje-utils += "cpp" +PACKAGES = "edje-utils" +FILES_edje-utils = "${bindir}/edje ${bindir}/edje_* ${datadir}/edje/data/template ${datadir}/edje/include" +RDEPENDS_edje-utils = "embryo-utils cpp" inherit efl -- cgit v1.2.3 From 16299ddeba8532198b663a0e34217c58c7a118f5 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Fri, 10 Feb 2006 01:24:06 +0000 Subject: edb: move utility binaries to edb-utils from edb-dev --- packages/efl/edb_1.0.5.005.bb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/efl/edb_1.0.5.005.bb b/packages/efl/edb_1.0.5.005.bb index 30c14d3d58..620b39d301 100644 --- a/packages/efl/edb_1.0.5.005.bb +++ b/packages/efl/edb_1.0.5.005.bb @@ -2,13 +2,14 @@ DESCRIPTION = "EDB is a database convenience library wrapped around the \ Berkeley DB 2.7.7 by Sleepycat Software." DEPENDS = "zlib ncurses" LICENSE = "BSD" -PR = "r1" +PR = "r2" + +PACKAGES = "edb-utils" +FILES_edb-utils = "${bindir}/edb_ed ${bindir}/edb_vt_ed ${bindir}/edb_gtk_ed" +RDEPENDS_edb-utils += "ncurses" inherit efl EXTRA_OECONF += "--disable-gtk" libdirectory = "src" - -FILES_${PN}-dev += "${bindir}/edb_ed ${bindir}/edb_vt_ed ${bindir}/edb_gtk_ed" -RDEPENDS_${PN}-dev += "ncurses" \ No newline at end of file -- cgit v1.2.3 From 5f501721be685c8a5dcf23346d905e0e7a0dc9c7 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Fri, 10 Feb 2006 01:31:53 +0000 Subject: edje: use += just in case --- packages/efl/edje_0.5.0.023.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/efl/edje_0.5.0.023.bb b/packages/efl/edje_0.5.0.023.bb index bc27ae5370..b0fbda0acb 100644 --- a/packages/efl/edje_0.5.0.023.bb +++ b/packages/efl/edje_0.5.0.023.bb @@ -6,7 +6,7 @@ PR = "r4" PACKAGES = "edje-utils" FILES_edje-utils = "${bindir}/edje ${bindir}/edje_* ${datadir}/edje/data/template ${datadir}/edje/include" -RDEPENDS_edje-utils = "embryo-utils cpp" +RDEPENDS_edje-utils += "embryo-utils cpp" inherit efl -- cgit v1.2.3 From 52675a0f186a37449790b58e8b4bfd0f7e655251 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Fri, 10 Feb 2006 01:55:31 +0000 Subject: embryo: remove extra embryo-dev in PACKAGES --- packages/efl/embryo_0.9.1.023.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/efl/embryo_0.9.1.023.bb b/packages/efl/embryo_0.9.1.023.bb index 8a9b5cab40..f5582ef9c2 100644 --- a/packages/efl/embryo_0.9.1.023.bb +++ b/packages/efl/embryo_0.9.1.023.bb @@ -6,7 +6,7 @@ basic programming structures such as in Edje EDCs." LICENSE = "MIT" PR = "r2" -PACKAGES = "embryo-utils embryo-dev" +PACKAGES = "embryo-utils" FILES_embryo-utils = "${bindir}/embryo ${bindir}/embryo_* ${datadir}/embryo/include" inherit efl -- cgit v1.2.3 From 1dfe53cd17ef4fb243b8fbdbd74ccfe76e40c09f Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Fri, 10 Feb 2006 04:27:00 +0000 Subject: login-manager: Fix a pathing bug which b0rks login-manager if only one LM is installed. --- packages/login-manager/files/login-manager | 19 +++++++++++++++++-- packages/login-manager/login-manager.bb | 2 +- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/packages/login-manager/files/login-manager b/packages/login-manager/files/login-manager index 6fbc307458..7b62dfa76b 100644 --- a/packages/login-manager/files/login-manager +++ b/packages/login-manager/files/login-manager @@ -4,12 +4,25 @@ # License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) # # Date: 09-FEB-06 - +# +# This script checks if a keyboard is present and then runs a propper LM. +# On devices w/o keyboard, a LM from the NO_KBD_LMS variable is selected. +# +# If more than one usable login-manager is found, the first one is used. +# +# Users can force their favorite login-manager to be selected via symlinking +# a LM from /etc/X11/login-managers to /etc/X11/login-managers/default. +# LM_PATH="/etc/X11/login-managers" +# A list of login-manager which display an OSD keyboard NO_KBD_LMS="gpe-dm" +# +# * * * No user-variables behind this point * * * +# + run_wm() { if test -z "$1" then @@ -19,6 +32,7 @@ run_wm() { echo "$1" > /tmp/_running_lm echo -e "\t* Starting `basename "$1"`\n--\n" + "$1" start exit 0 @@ -54,7 +68,8 @@ get_valid_lms() { then SELECTED_LM="$LM_PATH/`echo "$VALID_LMS" | awk '{print $1}'`" else - SELECTED_LM="$VALID_LMS" + # Use awk here, too to filter a backspace in VALID_LMS + SELECTED_LM="$LM_PATH/`echo "$VALID_LMS" | awk '{print $1}'`" fi fi } diff --git a/packages/login-manager/login-manager.bb b/packages/login-manager/login-manager.bb index 04f8b34a8f..44d8814713 100644 --- a/packages/login-manager/login-manager.bb +++ b/packages/login-manager/login-manager.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Initscript for login-managers" SECTION = "base" PRIORITY = "optional" MAINTAINER = "Matthias 'CoreDump' Hentges " -PR = "r0" +PR = "r1" INITSCRIPT_NAME = "login-manager" INITSCRIPT_PARAMS = "start 99 5 . stop 20 0 1 6 ." -- cgit v1.2.3 From f1ce6e581e05f2a41170a6ffb562104ffb9ed3e0 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Fri, 10 Feb 2006 09:25:19 +0000 Subject: zd1211: Add transmitkey index fix --- packages/zd1211/zd1211-r52/transmitkey.index.fix.diff | 16 ++++++++++++++++ packages/zd1211/zd1211_r52.bb | 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 packages/zd1211/zd1211-r52/transmitkey.index.fix.diff diff --git a/packages/zd1211/zd1211-r52/transmitkey.index.fix.diff b/packages/zd1211/zd1211-r52/transmitkey.index.fix.diff new file mode 100644 index 0000000000..a225d37698 --- /dev/null +++ b/packages/zd1211/zd1211-r52/transmitkey.index.fix.diff @@ -0,0 +1,16 @@ +--- zd1211-driver-r52/src/zd1205.c.orig 2006-02-10 10:02:56.000000000 +0100 ++++ zd1211-driver-r52/src/zd1205.c 2006-02-10 10:02:56.000000000 +0100 +@@ -5693,7 +5693,12 @@ + /* Check if the key is not marked as invalid */ + if (!(erq->flags & IW_ENCODE_NOKEY)) { // for command: key xxxxxxxxxx [n] + // ZD1211DEBUG(0, "Set contents of key %d\n", index+1); +- pSetting->EncryKeyId = index; ++ /* We change the transmit key only if we are ++ * transitioning from a no-encrypt state. This ++ * behavior is deduced from the iwconfig man page */ ++ if (pSetting->EncryOnOff == 0) { ++ pSetting->EncryKeyId = index; ++ } + memcpy(&pSetting->keyVector[index][0], key, pSetting->WepKeyLen); + zd1205_config_wep_keys(macp); + } else { // For command: key on diff --git a/packages/zd1211/zd1211_r52.bb b/packages/zd1211/zd1211_r52.bb index f8d9c78a9a..21982ad64f 100644 --- a/packages/zd1211/zd1211_r52.bb +++ b/packages/zd1211/zd1211_r52.bb @@ -3,7 +3,7 @@ PRIORITY = "optional" SECTION = "kernel/modules" MAINTAINER = "Oyvind Repvik " LICENSE = "GPL" -PR = "r3" +PR = "r4" RDEPENDS = "wireless-tools" SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ @@ -11,6 +11,7 @@ SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ file://firmware.patch;patch=1 \ file://zd1205.c.diff;patch=1 \ file://zdhci.c.diff;patch=1 \ + file://transmitkey.index.fix.diff;patch=1 \ " S = "${WORKDIR}/zd1211-driver-${PV}" -- cgit v1.2.3 From 21e22881ad0bb921d6f2ef04949523ad33a4d345 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 10 Feb 2006 09:46:50 +0000 Subject: zaurus-clamshell: s/c7x0/$MACHINE in IPKG_ARCHS - not every clamshell is c7x0 taken from .oz354fam083 --- conf/machine/include/zaurus-clamshell.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf index ec10cd5e4e..7fc3ccc2ec 100644 --- a/conf/machine/include/zaurus-clamshell.conf +++ b/conf/machine/include/zaurus-clamshell.conf @@ -1,5 +1,5 @@ TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm armv4 armv5te c7x0" +IPKG_ARCHS = "all arm armv4 armv5te ${MACHINE}" PREFERRED_PROVIDER_xserver = "xserver-kdrive" -- cgit v1.2.3 From 00800050e185b29e3f2091d5caa550250bc5a2cf Mon Sep 17 00:00:00 2001 From: Matt Reimer Date: Fri, 10 Feb 2006 18:56:16 +0000 Subject: h2200_bootloader: make it a bit quieter, and save the bootloader to the more appropriate filename h2200_bootloader.bin. --- packages/h2200-bootloader/h2200-bootloader.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/h2200-bootloader/h2200-bootloader.bb b/packages/h2200-bootloader/h2200-bootloader.bb index e0fbcac75a..03defa2aba 100644 --- a/packages/h2200-bootloader/h2200-bootloader.bb +++ b/packages/h2200-bootloader/h2200-bootloader.bb @@ -1,13 +1,10 @@ DESCRIPTION = "Bootloader firmware extractor for the h2200 iPAQ" -RRECOMMENDS = "kernel-module-mtdblock kernel-module-hamcop-nand" ALLOW_EMPTY = "1" MAINTAINER = "Koen Kooi " -PR="r1" +PR="r2" pkg_postinst() { #!/bin/sh -modprobe mtdblock -modprobe hamcop_nand mkdir -p /lib/firmware -dd if=/dev/mtdblock0 of=/lib/firmware/hamcop_bootloader.bin +dd if=/dev/mtdblock0 of=/lib/firmware/h2200_bootloader.bin 2>/dev/null } -- cgit v1.2.3 From 66c149d087d51bb0b4188f3d4eececfa5e6bd61f Mon Sep 17 00:00:00 2001 From: Matt Reimer Date: Fri, 10 Feb 2006 19:22:42 +0000 Subject: h2200.conf: Fix EXTRA_IMAGECMD_jffs2 to generate a working jffs2 image on h2200. Also remove unneeded module_autoload directives. --- conf/machine/h2200.conf | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index 37ae1a00e0..9aec6866bb 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -9,31 +9,17 @@ IPKG_ARCHS = "all arm armv4 armv4t armv5e armv5te ipaqpxa h2200" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" -EXTRA_IMAGECMD_h2200_jffs2 = "--pad --no-cleanmarkers --pagesize=512 --eraseblock=16384" +EXTRA_IMAGECMD_jffs2_h2200 = "--pad --no-cleanmarkers --eraseblock=16384" ROOT_FLASH_SIZE = "32" BOOTSTRAP_EXTRA_RRECOMMENDS += " ${@linux_module_packages('${H2200_MODULES}', d)}" -BOOTSTRAP_EXTRA_RDEPENDS_append = " h2200-bootloader kernel udev module-init-tools" +BOOTSTRAP_EXTRA_RDEPENDS_append = " mtd-utils h2200-bootloader kernel udev module-init-tools" #ship in rootfs: -H2200_MODULES = "g_ether g_serial g_file_storage sa1100-rtc apm pcmcia-core snd-pcm-oss snd-h2200_audio pxa2xx_h2200 h2200_pm h2200_lcd h2200_kbd h2200_battery mq11xx_base mq1100fb samcop_adcts w1_ds2760 w1_samcop " - +H2200_MODULES = "g_ether g_serial g_file_storage snd-pcm-oss" #autoload on boot: -module_autoload_h2200_pm = "h2200_pm" -module_autoload_h2200_kbd = "h2200_kbd" -module_autoload_h2200_lcd = "h2200_lcd" -module_autoload_mq11xx_base = "mq11xx_base" -module_autoload_mq1100fb = "mq1100fb" -module_autoload_samcop_adcts = "samcop_adcts" -module_autoload_samcop_sdi = "samcop_sdi" -module_autoload_w1_ds2760 = "w1_ds2760" -module_autoload_w1_samcop = "w1_samcop" -module_autoload_h2200_battery = "h2200_battery" -module_autoload_hamcop_nand = "hamcop_nand" -module_autoload_pxa2xx_h2200 = "pxa2xx_h2200" -module_autoload_snd_h2200_audio = "snd-h2200_audio" module_autoload_snd-pcm-oss = "snd-pcm-oss" SERIAL_CONSOLE = "115200 tts/0 vt100" -- cgit v1.2.3 From 9f4508d3a81efb68f2ee475895db81ccc7019789 Mon Sep 17 00:00:00 2001 From: Matt Reimer Date: Fri, 10 Feb 2006 19:27:42 +0000 Subject: handheld-common.conf: Add hidp and irtty-sir to HANDHELD_MODULES, so these modules get included in the rootfs. --- conf/machine/include/handheld-common.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/machine/include/handheld-common.conf b/conf/machine/include/handheld-common.conf index 467d5e59f1..59c83943da 100644 --- a/conf/machine/include/handheld-common.conf +++ b/conf/machine/include/handheld-common.conf @@ -7,12 +7,12 @@ ide-cs ide-disk ide-probe-mod \ loop \ vfat ext2 \ sunrpc nfs \ -btuart-cs dtl1-cs bt3c-cs rfcomm bnep l2cap sco hci_uart \ +btuart-cs dtl1-cs bt3c-cs rfcomm bnep l2cap sco hci_uart hidp \ pcnet-cs serial-cs airo-cs \ af_packet \ ppp-async ppp-deflate ppp-mppe \ ip-gre ip-tables ipip \ -irda irlan irnet irport irtty ircomm-tty \ +irda irlan irnet irport irtty ircomm-tty irtty-sir \ input uinput \ " -- cgit v1.2.3 From bf1d2f1d68fd60a50a7da2aeff0242240c832527 Mon Sep 17 00:00:00 2001 From: Matt Reimer Date: Fri, 10 Feb 2006 20:43:36 +0000 Subject: handheld-common.conf: Remove irtty-sir from HANDHELD_MODULES. --- conf/machine/include/handheld-common.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/include/handheld-common.conf b/conf/machine/include/handheld-common.conf index 59c83943da..fbecc6e25c 100644 --- a/conf/machine/include/handheld-common.conf +++ b/conf/machine/include/handheld-common.conf @@ -12,7 +12,7 @@ pcnet-cs serial-cs airo-cs \ af_packet \ ppp-async ppp-deflate ppp-mppe \ ip-gre ip-tables ipip \ -irda irlan irnet irport irtty ircomm-tty irtty-sir \ +irda irlan irnet irport irtty ircomm-tty \ input uinput \ " -- cgit v1.2.3 From fa3539b899bac502ce29f0cb073dbfd50f8a505f Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 11 Feb 2006 12:15:09 +0000 Subject: ixp4xx-kernel: Added initial ds101 patchset from NAiL --- packages/ixp4xx/ixp-osal-2.1/ixp4xx-header.patch | 10 +- packages/linux/ixp4xx-kernel.inc | 16 ++ .../ixp4xx-kernel/2.6.16/80-nas100d-fix-i2c.patch | 16 ++ .../linux/ixp4xx-kernel/2.6.16/94-loft-setup.patch | 154 +++++++++++ .../ixp4xx-kernel/2.6.16/94-nas100d-setup.patch | 11 +- .../ixp4xx-kernel/2.6.16/97-ds101-includes.patch | 102 ++++++++ .../linux/ixp4xx-kernel/2.6.16/97-ds101-misc.patch | 27 ++ .../linux/ixp4xx-kernel/2.6.16/97-ds101-pci.patch | 73 ++++++ .../ixp4xx-kernel/2.6.16/97-ds101-power.patch | 75 ++++++ .../ixp4xx-kernel/2.6.16/97-ds101-setup.patch | 288 +++++++++++++++++++++ packages/linux/ixp4xx-kernel/2.6.16/defconfig | 117 +++++---- packages/linux/ixp4xx-kernel_2.6.15.2.bb | 1 + packages/linux/ixp4xx-kernel_2.6.16-rc2.bb | 8 + 13 files changed, 834 insertions(+), 64 deletions(-) create mode 100644 packages/linux/ixp4xx-kernel/2.6.16/80-nas100d-fix-i2c.patch create mode 100644 packages/linux/ixp4xx-kernel/2.6.16/94-loft-setup.patch create mode 100644 packages/linux/ixp4xx-kernel/2.6.16/97-ds101-includes.patch create mode 100644 packages/linux/ixp4xx-kernel/2.6.16/97-ds101-misc.patch create mode 100644 packages/linux/ixp4xx-kernel/2.6.16/97-ds101-pci.patch create mode 100644 packages/linux/ixp4xx-kernel/2.6.16/97-ds101-power.patch create mode 100644 packages/linux/ixp4xx-kernel/2.6.16/97-ds101-setup.patch diff --git a/packages/ixp4xx/ixp-osal-2.1/ixp4xx-header.patch b/packages/ixp4xx/ixp-osal-2.1/ixp4xx-header.patch index 70eec5e728..a9d87d4b56 100644 --- a/packages/ixp4xx/ixp-osal-2.1/ixp4xx-header.patch +++ b/packages/ixp4xx/ixp-osal-2.1/ixp4xx-header.patch @@ -32,13 +32,14 @@ "qMgr" /* name */ --- ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Base.h 1970-01-01 00:00:00.000000000 +0000 +++ ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Base.h 1970-01-01 00:00:00.000000000 +0000 -@@ -0,0 +1,72 @@ +@@ -0,0 +1,80 @@ +/* + * Glue for the current linux definitons of this stuff. + */ +#ifndef IxOsalOsIxp425Base_H +#define IxOsalOsIxp425Base_H 1 +#include ++#include + +/* Force Address Coherent (the default) mapping on LE - Linux 2.6 + * does not have a way of changing it. @@ -64,7 +65,14 @@ +#define IXP425_PCI_CFG_BASE_PHYS IXP4XX_PCI_CFG_BASE_PHYS + +//#define IXP425_EXP_BUS_BASE1_PHYS ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16) +#define IXP425_EXP_BUS_BASE2_PHYS IXP4XX_EXP_BUS_CS2_BASE_PHYS ++#else ++/* The following definition should be IXP4XX_EXP_BUS_BASE(2), but that is not ++ static and causes compilation problems later. So we need to hard-code it. ++ Note that this hard-coded value is only correct for IXP42X. */ ++#define IXP425_EXP_BUS_BASE2_PHYS (IXP4XX_EXP_BUS_BASE_PHYS + (2 * SZ_16M)) ++#endif +//#define IXP425_EXP_BUS_CS0_BASE_PHYS +//#define IXP425_EXP_BUS_CS1_BASE_PHYS +//#define IXP425_EXP_BUS_CS4_BASE_PHYS diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc index 29b32e80d8..d5defebd7b 100644 --- a/packages/linux/ixp4xx-kernel.inc +++ b/packages/linux/ixp4xx-kernel.inc @@ -269,6 +269,20 @@ pkg_postrm_kernel-image-loft () { update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${ARCH_BYTE_SEX}-${KERNEL_RELEASE} || true } +# The correct settings for the DS101 board: +ds101_MACHID = "833" +PACKAGES += "kernel-image-ds101" +PKG_kernel-image-ds101 = "kernel-image-${KERNEL_VERSION}" +PACKAGE_ARCH_kernel-image-ds101 = "ds101${ARCH_BYTE_SEX}" +DESCRIPTION_kernel-image-ds101 = "Linux kernel for the Synology DS101" +FILES_kernel-image-ds101 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-ds101${ARCH_BYTE_SEX}-${KERNEL_RELEASE}" +pkg_postinst_kernel-image-ds101 () { + update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-ds101${ARCH_BYTE_SEX}-${KERNEL_RELEASE} ${KERNEL_PRIORITY} || true +} +pkg_postrm_kernel-image-ds101 () { + update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-ds101${ARCH_BYTE_SEX}-${KERNEL_RELEASE} || true +} + # The correct settings for the NAS100D board: nas100d_MACHID = "865" PACKAGES += "kernel-image-nas100d" @@ -329,6 +343,7 @@ do_install_append() { # Add the machine specific images, with appropriate suffixes install_image 'nslu2${ARCH_BYTE_SEX}' '${nslu2_MACHID}' install_image 'loft${ARCH_BYTE_SEX}' '${loft_MACHID}' + install_image 'ds101${ARCH_BYTE_SEX}' '${ds101_MACHID}' install_image 'nas100d${ARCH_BYTE_SEX}' '${nas100d_MACHID}' } @@ -345,6 +360,7 @@ do_deploy() { # And the machine specific images deploy_image 'nslu2${ARCH_BYTE_SEX}' '${nslu2_MACHID}' deploy_image 'loft${ARCH_BYTE_SEX}' '${loft_MACHID}' + deploy_image 'ds101${ARCH_BYTE_SEX}' '${ds101_MACHID}' deploy_image 'nas100d${ARCH_BYTE_SEX}' '${nas100d_MACHID}' } diff --git a/packages/linux/ixp4xx-kernel/2.6.16/80-nas100d-fix-i2c.patch b/packages/linux/ixp4xx-kernel/2.6.16/80-nas100d-fix-i2c.patch new file mode 100644 index 0000000000..6610cc0872 --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.16/80-nas100d-fix-i2c.patch @@ -0,0 +1,16 @@ + include/asm-arm/arch-ixp4xx/nas100d.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- linux-nslu2.orig/include/asm-arm/arch-ixp4xx/nas100d.h 2006-02-06 20:37:38.000000000 +0100 ++++ linux-nslu2/include/asm-arm/arch-ixp4xx/nas100d.h 2006-02-09 14:33:49.000000000 +0100 +@@ -19,8 +19,8 @@ + #error "Do not include this directly, instead #include " + #endif + +-#define NAS100D_SDA_PIN 6 +-#define NAS100D_SCL_PIN 5 ++#define NAS100D_SDA_PIN 5 ++#define NAS100D_SCL_PIN 6 + + /* + * NAS100D PCI IRQs diff --git a/packages/linux/ixp4xx-kernel/2.6.16/94-loft-setup.patch b/packages/linux/ixp4xx-kernel/2.6.16/94-loft-setup.patch new file mode 100644 index 0000000000..e84508b85b --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.16/94-loft-setup.patch @@ -0,0 +1,154 @@ + arch/arm/mach-ixp4xx/ixdp425-setup.c | 115 ++++++++++++++++++++++++++++++++++- + 1 file changed, 112 insertions(+), 3 deletions(-) + +--- linux-nslu2.orig/arch/arm/mach-ixp4xx/ixdp425-setup.c 2006-02-10 18:03:51.000000000 +0100 ++++ linux-nslu2/arch/arm/mach-ixp4xx/ixdp425-setup.c 2006-02-10 18:06:40.000000000 +0100 +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -25,6 +26,10 @@ + #include + #include + ++#ifdef CONFIG_MACLIST ++#include ++#endif ++ + static struct flash_platform_data ixdp425_flash_data = { + .map_name = "cfi_probe", + .width = 2, +@@ -176,17 +181,122 @@ MACHINE_START(AVILA, "Gateworks Avila Ne + MACHINE_END + #endif + ++#ifdef CONFIG_MACH_LOFT + /* + * Loft is functionally equivalent to Avila except that it has a + * different number for the maximum PCI devices. The MACHINE +- * structure below is identical to Avila except for the comment. ++ * structure below is derived from the Avila one (and may, in ++ * fact, be useful on Avila in general). ++ * ++ * The loft init registers a notifier on the on-board EEPROM to ++ * detect the MAC addresses. ++ * NOTE: this probably works for all Gateworks Avila boards and ++ * maybe the ixdp425 too. ++ * ++ * When the EEPROM is added the MAC address are read from it. + */ +-#ifdef CONFIG_MACH_LOFT ++ ++#if defined(CONFIG_SENSORS_EEPROM) && defined(CONFIG_MACLIST) ++static void loft_eeprom_add(int address, int kind, struct kobject *kobj, ++ struct bin_attribute *eeprom_attr) { ++ /* The MACs are the first 12 bytes in the eeprom at address 0x51 */ ++ if (address == 0x51) { ++ ssize_t retlen; ++ char data[12]; ++ ++ /* Two Macs, one at 0, the other at 6, maclist_add will ++ * complain if the ID is not a valid MAC. ++ */ ++ retlen = eeprom_attr->read(kobj, data, 0, sizeof data); ++ if (retlen >= 6) { ++ u8 mac[6]; ++ memcpy(mac, data+0, sizeof mac); ++ printk(KERN_INFO "LOFT MAC[0]: %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n", ++ mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); ++ maclist_add(mac); ++ } ++ if (retlen >= 12) { ++ u8 mac[6]; ++ memcpy(mac, data+6, sizeof mac); ++ printk(KERN_INFO "LOFT MAC[1]: %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n", ++ mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); ++ maclist_add(mac); ++ } ++ } ++} ++ ++static struct eeprom_notifier loft_eeprom_notifier = { ++ .add = loft_eeprom_add ++}; ++#endif ++ ++/* ++ * Loft bootstrap may pass in parameters, if these contain an ++ * ATAG_MEM and it appears valid (not the 16MByte one in the ++ * setup/kernel.c default) we use it, otherwise a 64MByte ++ * setting is forced here, this may be overridden on the ++ * command line. ++ */ ++static void __init loft_fixup(struct machine_desc *desc, ++ struct tag *tags, char **cmdline, struct meminfo *mi) ++{ ++ char saved_command_line[COMMAND_LINE_SIZE]; ++ ++ /* Put Loft specific known-required-for-certain stuff here, leave ++ * a trailing space! ++ */ ++ static char loft_command_line[] = ++ "root=/dev/mtdblock2 rw rootfstype=jffs2 init=/linuxrc " ++ "rtc-ds1672.probe=0,0x68 "; ++ const int len = (sizeof loft_command_line) - 1; ++ int memtag = 0; ++ ++ /* The EEPROM has two ethernet MACs embedded in it which we need, ++ * that is all this notifier does. ++ */ ++#ifdef CONFIG_SENSORS_EEPROM ++ register_eeprom_user(&loft_eeprom_notifier); ++#endif ++ ++ /* The Loft typically has one bank of 64MByte memory. ++ * NOTE: setting nr_banks != 0 causes kernel/setup.c to remove ++ * the mem tags from the tag list, so if there is an entry ++ * there don't remove it! ++ */ ++ if (tags->hdr.tag == ATAG_CORE) do { ++ tags = tag_next(tags); ++ printk(KERN_NOTICE "ATAG[0x%x] size %d\n", tags->hdr.tag, tags->hdr.size); ++ if (tags->hdr.tag == ATAG_MEM && tags->hdr.size == tag_size(tag_mem32) && ++ (tags->u.mem.start != 0 || tags->u.mem.size != (16*1024*1024))) { ++ memtag = 1; ++ printk(KERN_NOTICE " ATAG_MEM base %x, size %dMB\n", ++ tags->u.mem.start, ++ tags->u.mem.size / (1024*1024)); ++ } ++ } while (tags->hdr.size); ++ ++ if (!memtag) { ++ mi->nr_banks = 1; ++ mi->bank[0].start = 0; ++ mi->bank[0].size = (64*1024*1024); ++ mi->bank[0].node = PHYS_TO_NID(0); ++ } ++ ++ /* A command line in the ATAG list will override this one, ++ * as is intended. ++ */ ++ memcpy(saved_command_line, *cmdline, COMMAND_LINE_SIZE); ++ memcpy(*cmdline, loft_command_line, len); ++ memcpy(*cmdline + len, saved_command_line, COMMAND_LINE_SIZE - len); ++ *cmdline[COMMAND_LINE_SIZE-1] = 0; ++} ++ + MACHINE_START(LOFT, "Giant Shoulder Inc Loft board") + /* Maintainer: Tom Billman */ + .phys_ram = PHYS_OFFSET, + .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, + .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, ++ .fixup = loft_fixup, + .map_io = ixp4xx_map_io, + .init_irq = ixp4xx_init_irq, + .timer = &ixp4xx_timer, +@@ -194,4 +304,3 @@ MACHINE_START(LOFT, "Giant Shoulder Inc + .init_machine = ixdp425_init, + MACHINE_END + #endif +- diff --git a/packages/linux/ixp4xx-kernel/2.6.16/94-nas100d-setup.patch b/packages/linux/ixp4xx-kernel/2.6.16/94-nas100d-setup.patch index bc7bf2061a..b9c4c265d0 100644 --- a/packages/linux/ixp4xx-kernel/2.6.16/94-nas100d-setup.patch +++ b/packages/linux/ixp4xx-kernel/2.6.16/94-nas100d-setup.patch @@ -4,11 +4,11 @@ in the boot loader. Signed-off-by: John Bowler - arch/arm/mach-ixp4xx/nas100d-setup.c | 43 +++++++++++++++++++++++++++++++++++ - 1 file changed, 43 insertions(+) + arch/arm/mach-ixp4xx/nas100d-setup.c | 42 +++++++++++++++++++++++++++++++++++ + 1 file changed, 42 insertions(+) ---- linux-nslu2.orig/arch/arm/mach-ixp4xx/nas100d-setup.c 2006-02-06 22:35:26.000000000 +0100 -+++ linux-nslu2/arch/arm/mach-ixp4xx/nas100d-setup.c 2006-02-06 22:40:20.000000000 +0100 +--- linux-nslu2.orig/arch/arm/mach-ixp4xx/nas100d-setup.c 2006-02-09 13:24:19.000000000 +0100 ++++ linux-nslu2/arch/arm/mach-ixp4xx/nas100d-setup.c 2006-02-09 15:13:56.000000000 +0100 @@ -17,6 +17,8 @@ #include #include @@ -18,7 +18,7 @@ Signed-off-by: John Bowler #include #include #include -@@ -161,11 +163,52 @@ static void __init nas100d_init(void) +@@ -161,11 +163,51 @@ static void __init nas100d_init(void) platform_add_devices(nas100d_devices, ARRAY_SIZE(nas100d_devices)); } @@ -41,7 +41,6 @@ Signed-off-by: John Bowler + */ +static char nas100d_command_line[] __initdata = + "root=/dev/mtdblock2 rootfstype=jffs2 init=/linuxrc " -+ "pcf8563.hctosys=1 " + CONFIG_CMDLINE; + +static void __init nas100d_fixup(struct machine_desc *desc, diff --git a/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-includes.patch b/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-includes.patch new file mode 100644 index 0000000000..d9a5f07494 --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-includes.patch @@ -0,0 +1,102 @@ +diff -ruN linux-2.6.15.orig/include/asm-arm/arch-ixp4xx/hardware.h linux-2.6.15.new/include/asm-arm/arch-ixp4xx/hardware.h +--- linux-2.6.15.orig/include/asm-arm/arch-ixp4xx/hardware.h 2006-02-11 02:58:47.000000000 +0100 ++++ linux-2.6.15.new/include/asm-arm/arch-ixp4xx/hardware.h 2006-02-10 22:26:54.000000000 +0100 +@@ -46,5 +46,6 @@ + #include "prpmc1100.h" + #include "nslu2.h" + #include "nas100d.h" ++#include "ds101.h" + + #endif /* _ASM_ARCH_HARDWARE_H */ +diff -ruN linux-2.6.15.orig/include/asm-arm/arch-ixp4xx/irqs.h linux-2.6.15.new/include/asm-arm/arch-ixp4xx/irqs.h +--- linux-2.6.15.orig/include/asm-arm/arch-ixp4xx/irqs.h 2006-02-11 02:58:47.000000000 +0100 ++++ linux-2.6.15.new/include/asm-arm/arch-ixp4xx/irqs.h 2006-02-10 22:56:11.000000000 +0100 +@@ -108,5 +108,12 @@ + #define IRQ_NAS100D_PCI_INTC IRQ_IXP4XX_GPIO9 + #define IRQ_NAS100D_PCI_INTD IRQ_IXP4XX_GPIO8 + #define IRQ_NAS100D_PCI_INTE IRQ_IXP4XX_GPIO7 ++/* ++ * DS101 board IRQs ++ */ ++ ++#define IRQ_DS101_PCI_INTA IRQ_IXP4XX_GPIO11 ++#define IRQ_DS101_PCI_INTB IRQ_IXP4XX_GPIO10 ++#define IRQ_DS101_PCI_INTC IRQ_IXP4XX_GPIO9 + + #endif +diff -ruN linux-2.6.15.orig/include/asm-arm/arch/ds101.h linux-2.6.15.new/include/asm-arm/arch/ds101.h +--- linux-2.6.15.orig/include/asm-arm/arch-ixp4xx/ds101.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.15.new/include/asm-arm/arch-ixp4xx/ds101.h 2006-02-10 22:16:24.000000000 +0100 +@@ -0,0 +1,72 @@ ++/* ++ * include/asm-arm/arch-ixp4xx/ds101.h ++ * ++ * DS101 platform specific definitions ++ * ++ * Copyright (c) 2005 Tower Technologies ++ * ++ * Author: Alessandro Zummo ++ * ++ * based on ixdp425.h: ++ * Copyright 2004 (c) MontaVista, Software, Inc. ++ * ++ * This file is licensed under the terms of the GNU General Public ++ * License version 2. This program is licensed "as is" without any ++ * warranty of any kind, whether express or implied. ++ */ ++ ++#ifndef __ASM_ARCH_HARDWARE_H__ ++#error "Do not include this directly, instead #include " ++#endif ++ ++#define DS101_SDA_PIN 1 ++#define DS101_SCL_PIN 0 ++ ++/* ++ * DS101 PCI IRQs ++ */ ++#define DS101_PCI_MAX_DEV 3 ++#define DS101_PCI_IRQ_LINES 3 ++ ++ ++/* PCI controller GPIO to IRQ pin mappings */ ++#define DS101_PCI_INTA_PIN 11 ++#define DS101_PCI_INTB_PIN 10 ++#define DS101_PCI_INTC_PIN 9 ++// #define DS101_PCI_INTD_PIN 8 ++// #define DS101_PCI_INTE_PIN 7 ++ ++/* GPIO */ ++ ++#define DS101_GPIO0 0 ++#define DS101_GPIO1 1 ++#define DS101_GPIO2 2 ++#define DS101_GPIO3 3 ++#define DS101_GPIO4 4 ++#define DS101_GPIO5 5 ++#define DS101_GPIO6 6 ++#define DS101_GPIO7 7 ++#define DS101_GPIO8 8 ++#define DS101_GPIO9 9 ++#define DS101_GPIO10 10 ++#define DS101_GPIO11 11 ++#define DS101_GPIO12 12 ++#define DS101_GPIO13 13 ++#define DS101_GPIO14 14 ++#define DS101_GPIO15 15 ++ ++ ++/* Buttons */ ++ ++#define DS101_PB_GPIO DS101_GPIO8 ++#define DS101_RB_GPIO DS101_GPIO12 ++#define DS101_PO_GPIO DS101_GPIO7 /* power off */ ++ ++#define DS101_PB_IRQ IRQ_IXP4XX_GPIO8 ++#define DS101_RB_IRQ IRQ_IXP4XX_GPIO12 ++ ++/* ++#define DS101_PB_BM (1L << DS101_PB_GPIO) ++#define DS101_PO_BM (1L << DS101_PO_GPIO) ++#define DS101_RB_BM (1L << DS101_RB_GPIO) ++*/ diff --git a/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-misc.patch b/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-misc.patch new file mode 100644 index 0000000000..ea5f91b45f --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-misc.patch @@ -0,0 +1,27 @@ +diff -ruN linux-2.6.15.orig/arch/arm/mach-ixp4xx/Makefile linux-2.6.15.new/arch/arm/mach-ixp4xx/Makefile +--- linux-2.6.15.orig/arch/arm/mach-ixp4xx/Makefile 2006-02-11 02:57:58.000000000 +0100 ++++ linux-2.6.15.new/arch/arm/mach-ixp4xx/Makefile 2006-02-10 22:13:27.000000000 +0100 +@@ -10,4 +10,4 @@ + obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-pci.o gtwx5715-setup.o + obj-$(CONFIG_MACH_NSLU2) += nslu2-pci.o nslu2-setup.o nslu2-power.o + obj-$(CONFIG_MACH_NAS100D) += nas100d-pci.o nas100d-setup.o nas100d-power.o +- ++obj-$(CONFIG_MACH_DS101) += ds101-pci.o ds101-setup.o ds101-power.o +diff -ruN linux-2.6.15.orig/arch/arm/mach-ixp4xx/Kconfig linux-2.6.15.new/arch/arm/mach-ixp4xx/Kconfig +--- linux-2.6.15.orig/arch/arm/mach-ixp4xx/Kconfig 2006-02-11 03:00:07.000000000 +0100 ++++ linux-2.6.15.new/arch/arm/mach-ixp4xx/Kconfig 2006-02-10 22:21:09.000000000 +0100 +@@ -86,6 +86,14 @@ + NAS 100d device. For more information on this platform, + see http://www.nslu2-linux.org/wiki/NAS100d/HomePage + ++config MACH_DS101 ++ bool ++ prompt "DS101" ++ help ++ Say 'Y' here if you want your kernel to support Synology's ++ DiskStation DS101(j) device. For more information on this ++ platform see http://www.nslu2-linux.org/wiki/DS101/HomePage ++ + # + # Avila and IXDP share the same source for now. Will change in future + # diff --git a/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-pci.patch b/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-pci.patch new file mode 100644 index 0000000000..8940bd63a6 --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-pci.patch @@ -0,0 +1,73 @@ +diff -ruN linux-2.6.15.orig/arch/arm/mach-ixp4xx/ds101-pci.c linux-2.6.15.new/arch/arm/mach-ixp4xx/ds101-pci.c +--- linux-2.6.15.orig/arch/arm/mach-ixp4xx/ds101-pci.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.15.new/arch/arm/mach-ixp4xx/ds101-pci.c 2006-02-10 22:31:00.000000000 +0100 +@@ -0,0 +1,69 @@ ++/* ++ * arch/arm/mach-ixp4xx/ds101-pci.c ++ * ++ * DS101 board-level PCI initialization ++ * ++ * based on ixdp425-pci.c: ++ * Copyright (C) 2002 Intel Corporation. ++ * Copyright (C) 2003-2004 MontaVista Software, Inc. ++ * ++ * Maintainer: http://www.nslu2-linux.org/ ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ * ++ */ ++ ++#include ++#include ++#include ++ ++#include ++#include ++ ++void __init ds101_pci_preinit(void) ++{ ++ set_irq_type(IRQ_DS101_PCI_INTA, IRQT_LOW); ++ set_irq_type(IRQ_DS101_PCI_INTB, IRQT_LOW); ++ set_irq_type(IRQ_DS101_PCI_INTC, IRQT_LOW); ++ ++ ixp4xx_pci_preinit(); ++} ++ ++static int __init ds101_map_irq(struct pci_dev *dev, u8 slot, u8 pin) ++{ ++ static int pci_irq_table[DS101_PCI_MAX_DEV][DS101_PCI_IRQ_LINES] = ++ { ++ { IRQ_DS101_PCI_INTA, -1, -1 }, ++ { IRQ_DS101_PCI_INTB, -1, -1 }, ++ { IRQ_DS101_PCI_INTC, -1, -1 }, ++ }; ++ ++ int irq = -1; ++ ++ if (slot >= 1 && slot <= DS101_PCI_MAX_DEV && ++ pin >= 1 && pin <= DS101_PCI_IRQ_LINES) ++ irq = pci_irq_table[slot-1][pin-1]; ++ ++ return irq; ++} ++ ++struct hw_pci __initdata ds101_pci = { ++ .nr_controllers = 1, ++ .preinit = ds101_pci_preinit, ++ .swizzle = pci_std_swizzle, ++ .setup = ixp4xx_setup, ++ .scan = ixp4xx_scan_bus, ++ .map_irq = ds101_map_irq, ++}; ++ ++int __init ds101_pci_init(void) ++{ ++ if (machine_is_ds101()) ++ pci_common_init(&ds101_pci); ++ ++ return 0; ++} ++ ++subsys_initcall(ds101_pci_init); diff --git a/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-power.patch b/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-power.patch new file mode 100644 index 0000000000..3c309f3536 --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-power.patch @@ -0,0 +1,75 @@ +diff -ruN linux-2.6.15.orig/arch/arm/mach-ixp4xx/ds101-power.c linux-2.6.15.new/arch/arm/mach-ixp4xx/ds101-power.c +--- linux-2.6.15.orig/arch/arm/mach-ixp4xx/ds101-power.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.15.new/arch/arm/mach-ixp4xx/ds101-power.c 2006-02-10 23:54:40.000000000 +0100 +@@ -0,0 +1,71 @@ ++/* ++ * arch/arm/mach-ixp4xx/ds101-power.c ++ * ++ * DS101 Power/Reset driver ++ * ++ * Copyright (C) 2005 Tower Technologies ++ * ++ * based on ds101-io.c ++ * Copyright (C) 2004 Karen Spearel ++ * ++ * Author: Alessandro Zummo ++ * Author: OEyvind Repvik ++ * Maintainers: http://www.nslu2-linux.org/ ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ * ++ */ ++ ++#include ++#include ++#include ++ ++#include ++ ++extern void ctrl_alt_del(void); ++ ++static irqreturn_t ds101_reset_handler(int irq, void *dev_id, struct pt_regs *regs) ++{ ++ /* Signal init to do the ctrlaltdel action, this will bypass init if ++ * it hasn't started and do a kernel_restart. ++ */ ++ ctrl_alt_del(); ++ ++ return IRQ_HANDLED; ++} ++ ++static int __init ds101_power_init(void) ++{ ++ if (!(machine_is_ds101())) ++ return 0; ++ ++ set_irq_type(DS101_RB_IRQ, IRQT_LOW); ++ ++ if (request_irq(DS101_RB_IRQ, &ds101_reset_handler, ++ SA_INTERRUPT, "DS101 reset button", NULL) < 0) { ++ ++ printk(KERN_DEBUG "Reset Button IRQ %d not available\n", ++ DS101_RB_IRQ); ++ ++ return -EIO; ++ } ++ ++ return 0; ++} ++ ++static void __exit ds101_power_exit(void) ++{ ++ if (!(machine_is_ds101())) ++ return; ++ ++ free_irq(DS101_RB_IRQ, NULL); ++} ++ ++module_init(ds101_power_init); ++module_exit(ds101_power_exit); ++ ++MODULE_AUTHOR("Alessandro Zummo "); ++MODULE_DESCRIPTION("DS101 Power/Reset driver"); ++MODULE_LICENSE("GPL"); diff --git a/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-setup.patch b/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-setup.patch new file mode 100644 index 0000000000..ac3f7d19c7 --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-setup.patch @@ -0,0 +1,288 @@ +diff -ruN linux-2.6.15.orig/arch/arm/mach-ixp4xx/ds101-setup.c linux-2.6.15.new/arch/arm/mach-ixp4xx/ds101-setup.c +--- linux-2.6.15.orig/arch/arm/mach-ixp4xx/ds101-setup.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.15.new/arch/arm/mach-ixp4xx/ds101-setup.c 2006-02-11 02:17:35.000000000 +0100 +@@ -0,0 +1,284 @@ ++/* ++ * arch/arm/mach-ixp4xx/ds101-setup.c ++ * ++ * DS 101 board-setup ++ * ++ * based ixdp425-setup.c: ++ * Copyright (C) 2003-2004 MontaVista Software, Inc. ++ * ++ * Author: Alessandro Zummo ++ * Author: Rod Whitby ++ * Author: OEyvind Repvik ++ * Maintainers: http://www.nslu2-linux.org/ ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++ ++static struct flash_platform_data ds101_flash_data = { ++ .map_name = "cfi_probe", ++ .width = 2, ++}; ++ ++static struct resource ds101_flash_resource = { ++ .flags = IORESOURCE_MEM, ++}; ++ ++static struct platform_device ds101_flash = { ++ .name = "IXP4XX-Flash", ++ .id = 0, ++ .dev.platform_data = &ds101_flash_data, ++ .num_resources = 1, ++ .resource = &ds101_flash_resource, ++}; ++ ++#ifdef CONFIG_LEDS_CLASS ++static struct resource ds101_led_resources[] = { ++ { ++ .name = "power", /* blue power led */ ++ .start = 3, ++ .end = 3, ++ .flags = IXP4XX_GPIO_LOW, ++ }, ++ { ++ .name = "status-1", ++ .start = 14, ++ .end = 14, ++ .flags = IXP4XX_GPIO_LOW, ++ }, ++ { ++ .name = "status-2", ++ .start = 15, ++ .end = 15, ++ .flags = IXP4XX_GPIO_LOW, ++ }, ++ { ++ .name = "usb-1", /* The usb-copy-button led */ ++ .start = 5, ++ .end = 5, ++ .flags = IXP4XX_GPIO_LOW, ++ }, ++ { ++ .name = "usb-2", /* also the usb-copy-button led */ ++ .start = 4, ++ .end = 4, ++ .flags = IXP4XX_GPIO_LOW, ++ }, ++ { ++ .name = "test", ++ .start = 6, ++ .end = 6, ++ .flags = IXP4XX_GPIO_LOW, ++ }, ++}; ++ ++ ++static struct platform_device ds101_leds = { ++ .name = "IXP4XX-GPIO-LED", ++ .id = -1, ++ .num_resources = ARRAY_SIZE(ds101_led_resources), ++ .resource = ds101_led_resources, ++}; ++#endif ++ ++static struct ixp4xx_i2c_pins ds101_i2c_gpio_pins = { ++ .sda_pin = DS101_SDA_PIN, ++ .scl_pin = DS101_SCL_PIN, ++}; ++ ++static struct platform_device ds101_i2c_controller = { ++ .name = "IXP4XX-I2C", ++ .id = 0, ++ .dev.platform_data = &ds101_i2c_gpio_pins, ++ .num_resources = 0, ++}; ++ ++static struct platform_device ds101_beeper = { ++ .name = "ixp4xx-beeper", ++ .id = 2, ++ .num_resources = 0, ++}; ++ ++static struct resource ds101_uart_resources[] = { ++ { ++ .start = IXP4XX_UART1_BASE_PHYS, ++ .end = IXP4XX_UART1_BASE_PHYS + 0x0fff, ++ .flags = IORESOURCE_MEM, ++ }, ++ { ++ .start = IXP4XX_UART2_BASE_PHYS, ++ .end = IXP4XX_UART2_BASE_PHYS + 0x0fff, ++ .flags = IORESOURCE_MEM, ++ } ++}; ++ ++static struct plat_serial8250_port ds101_uart_data[] = { ++ { ++ .mapbase = IXP4XX_UART1_BASE_PHYS, ++ .membase = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET, ++ .irq = IRQ_IXP4XX_UART1, ++ .flags = UPF_BOOT_AUTOCONF, ++ .iotype = UPIO_MEM, ++ .regshift = 2, ++ .uartclk = IXP4XX_UART_XTAL, ++ }, ++ { ++ .mapbase = IXP4XX_UART2_BASE_PHYS, ++ .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, ++ .irq = IRQ_IXP4XX_UART2, ++ .flags = UPF_BOOT_AUTOCONF, ++ .iotype = UPIO_MEM, ++ .regshift = 2, ++ .uartclk = IXP4XX_UART_XTAL, ++ }, ++ { } ++}; ++ ++static struct platform_device ds101_uart = { ++ .name = "serial8250", ++ .id = PLAT8250_DEV_PLATFORM, ++ .dev.platform_data = ds101_uart_data, ++ .num_resources = 2, ++ .resource = ds101_uart_resources, ++}; ++ ++static struct platform_device *ds101_devices[] __initdata = { ++ &ds101_i2c_controller, ++ &ds101_flash, ++ &ds101_beeper, ++}; ++ ++static void ds101_power_off(void) ++{ ++ /* This causes the box to drop the power and go dead. */ ++ ++ /* enable the pwr cntl gpio */ ++ gpio_line_config(DS101_PO_GPIO, IXP4XX_GPIO_OUT); ++ ++ /* do the deed */ ++ gpio_line_set(DS101_PO_GPIO, IXP4XX_GPIO_HIGH); ++} ++ ++/* ++ * When the RedBoot config partition is added the MAC address is read from ++ * it. ++ * FIXME: This isn't correct on the DS101! ++ */ ++static void ds101_flash_add(struct mtd_info *mtd) { ++ if (strcmp(mtd->name, "RedBoot config") == 0) { ++ size_t retlen; ++ u_char mac[6]; ++ ++ /* The MAC is at a known offset... */ ++ if (mtd->read(mtd, 0x0FD8, 6, &retlen, mac) == 0 && retlen == 6) { ++ printk(KERN_INFO "DS101 MAC: %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n", ++ mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); ++ maclist_add(mac); ++ } else { ++ printk(KERN_ERR "DS101 MAC: read failed\n"); ++ } ++ } ++} ++ ++/* ++ * Nothing to do on remove at present. ++ */ ++static void ds101_flash_remove(struct mtd_info *mtd) { ++} ++ ++static struct mtd_notifier ds101_flash_notifier = { ++ .add = ds101_flash_add, ++ .remove = ds101_flash_remove, ++}; ++ ++static void __init ds101_init(void) ++{ ++ /* The flash has an ethernet MAC embedded in it which we need, ++ * that is all this notifier does. ++ */ ++ register_mtd_user(&ds101_flash_notifier); ++ ++ ixp4xx_sys_init(); ++ ++ ds101_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); ++ ds101_flash_resource.end = ++ IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1; ++ ++ pm_power_off = ds101_power_off; ++ ++ /* This is only useful on a modified machine, but it is valuable ++ * to have it first in order to see debug messages, and so that ++ * it does *not* get removed if platform_add_devices fails! ++ */ ++ (void)platform_device_register(&ds101_uart); ++ ++ platform_add_devices(ds101_devices, ARRAY_SIZE(ds101_devices)); ++ ++#ifdef CONFIG_LEDS_CLASS ++ /* We don't care whether or not this works. */ ++ (void)platform_device_register(&ds101_leds); ++#endif ++} ++ ++/* ++ * DS101 bootstrap may pass in parameters, but we zap the mem ++ * settings to be safe (the box always has 64MByte at 0). The ++ * passed in command line can override this default, we prepend ++ * to the config'ed default. ++ * ++ * NOTE: the startup sequence is: ++ * 1) Call the machine fixup ++ * 2) Parse the ATAG list, the ATAG_CMDLINE is copied in ++ * to default_command_line which is the value of *from ++ * 3) Parse the command line in *from (*not* ++ * default_command_line unless they are the same!) ++ * ++ * Setting mi->nr_banks causes (2) to 'squash' (set to ATAG_NONE) ++ * any ATAG_MEM tags, but mem= command line options cause nr_banks ++ * to be reset to 0 (on the first mem=) ++ */ ++static char ds101_command_line[] __initdata = ++ "root=/dev/sda1 rootfstype=ext3 init=/sbin/init " ++ CONFIG_CMDLINE; ++ ++static void __init ds101_fixup(struct machine_desc *desc, ++ struct tag *tags, char **cmdline, struct meminfo *mi) ++{ ++ /* The DS101 has one bank of 64MByte memory. ++ * NOTE: setting nr_banks != 0 causes kernel/setup.c to remove ++ * the mem tags from the tag list. We need do nothing here! ++ */ ++ mi->nr_banks=1; ++ mi->bank[0].start = 0; ++ mi->bank[0].size = (64*1024*1024); ++ mi->bank[0].node = PHYS_TO_NID(0); ++ ++ /* A command line in the ATAG list will override this one, ++ * as is intended. ++ */ ++ strlcpy(*cmdline, ds101_command_line, COMMAND_LINE_SIZE); ++} ++ ++MACHINE_START(DS101, "Synology DiskStation DS101") ++ /* Maintainer: www.nslu2-linux.org */ ++ .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, ++ .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xFFFC, ++ .boot_params = 0x00000100, ++ .fixup = ds101_fixup, ++ .map_io = ixp4xx_map_io, ++ .init_irq = ixp4xx_init_irq, ++ .timer = &ixp4xx_timer, ++ .init_machine = ds101_init, ++MACHINE_END diff --git a/packages/linux/ixp4xx-kernel/2.6.16/defconfig b/packages/linux/ixp4xx-kernel/2.6.16/defconfig index 25c2ba40c2..e7973518c7 100644 --- a/packages/linux/ixp4xx-kernel/2.6.16/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.16/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16-rc2 -# Thu Feb 9 20:54:57 2006 +# Thu Feb 9 23:00:47 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -124,6 +124,7 @@ CONFIG_ARCH_IXDP425=y CONFIG_ARCH_IXCDP1100=y # CONFIG_ARCH_PRPMC1100 is not set CONFIG_MACH_NAS100D=y +CONFIG_MACH_DS101=y CONFIG_ARCH_IXDP4XX=y # CONFIG_MACH_GTWX5715 is not set @@ -583,60 +584,7 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8 # # ATA/ATAPI/MFM/RLL support # -CONFIG_IDE=y -CONFIG_BLK_DEV_IDE=y - -# -# Please see Documentation/ide.txt for help/info on IDE drives -# -# CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_BLK_DEV_IDEDISK=y -# CONFIG_IDEDISK_MULTI_MODE is not set -# CONFIG_BLK_DEV_IDECD is not set -# CONFIG_BLK_DEV_IDETAPE is not set -# CONFIG_BLK_DEV_IDEFLOPPY is not set -# CONFIG_BLK_DEV_IDESCSI is not set -# CONFIG_IDE_TASK_IOCTL is not set - -# -# IDE chipset support/bugfixes -# -CONFIG_IDE_GENERIC=y -CONFIG_BLK_DEV_IDEPCI=y -# CONFIG_IDEPCI_SHARE_IRQ is not set -# CONFIG_BLK_DEV_OFFBOARD is not set -# CONFIG_BLK_DEV_GENERIC is not set -# CONFIG_BLK_DEV_OPTI621 is not set -# CONFIG_BLK_DEV_SL82C105 is not set -CONFIG_BLK_DEV_IDEDMA_PCI=y -# CONFIG_BLK_DEV_IDEDMA_FORCED is not set -# CONFIG_IDEDMA_PCI_AUTO is not set -CONFIG_BLK_DEV_AEC62XX=y -# CONFIG_BLK_DEV_ALI15X3 is not set -# CONFIG_BLK_DEV_AMD74XX is not set -# CONFIG_BLK_DEV_CMD64X is not set -# CONFIG_BLK_DEV_TRIFLEX is not set -# CONFIG_BLK_DEV_CY82C693 is not set -# CONFIG_BLK_DEV_CS5520 is not set -# CONFIG_BLK_DEV_CS5530 is not set -# CONFIG_BLK_DEV_HPT34X is not set -# CONFIG_BLK_DEV_HPT366 is not set -# CONFIG_BLK_DEV_SC1200 is not set -# CONFIG_BLK_DEV_PIIX is not set -# CONFIG_BLK_DEV_IT821X is not set -# CONFIG_BLK_DEV_NS87415 is not set -# CONFIG_BLK_DEV_PDC202XX_OLD is not set -# CONFIG_BLK_DEV_PDC202XX_NEW is not set -# CONFIG_BLK_DEV_SVWKS is not set -# CONFIG_BLK_DEV_SIIMAGE is not set -# CONFIG_BLK_DEV_SLC90E66 is not set -# CONFIG_BLK_DEV_TRM290 is not set -# CONFIG_BLK_DEV_VIA82CXXX is not set -# CONFIG_IDE_ARM is not set -CONFIG_BLK_DEV_IDEDMA=y -# CONFIG_IDEDMA_IVB is not set -# CONFIG_IDEDMA_AUTO is not set -# CONFIG_BLK_DEV_HD is not set +# CONFIG_IDE is not set # # SCSI device support @@ -686,7 +634,53 @@ CONFIG_SCSI_MULTI_LUN=y # CONFIG_MEGARAID_NEWGEN is not set # CONFIG_MEGARAID_LEGACY is not set # CONFIG_MEGARAID_SAS is not set -# CONFIG_SCSI_SATA is not set +CONFIG_SCSI_SATA=y +# CONFIG_SCSI_SATA_AHCI is not set +# CONFIG_SCSI_SATA_SVW is not set +# CONFIG_SCSI_ATA_PIIX is not set +# CONFIG_SCSI_SATA_MV is not set +# CONFIG_SCSI_SATA_NV is not set +# CONFIG_SCSI_PDC_ADMA is not set +# CONFIG_SCSI_SATA_QSTOR is not set +# CONFIG_SCSI_SATA_PROMISE is not set +# CONFIG_SCSI_SATA_SX4 is not set +# CONFIG_SCSI_SATA_SIL is not set +# CONFIG_SCSI_SATA_SIL24 is not set +# CONFIG_SCSI_SATA_SIS is not set +# CONFIG_SCSI_SATA_ULI is not set +# CONFIG_SCSI_SATA_VIA is not set +# CONFIG_SCSI_SATA_VITESSE is not set +# CONFIG_SCSI_PATA_ALI is not set +# CONFIG_SCSI_PATA_AMD is not set +CONFIG_SCSI_PATA_ARTOP=y +# CONFIG_SCSI_PATA_ATIIXP is not set +# CONFIG_SCSI_PATA_CMD64X is not set +# CONFIG_SCSI_PATA_CS5520 is not set +# CONFIG_SCSI_PATA_CS5530 is not set +# CONFIG_SCSI_PATA_CYPRESS is not set +# CONFIG_SCSI_PATA_EFAR is not set +# CONFIG_SCSI_ATA_GENERIC is not set +# CONFIG_SCSI_PATA_HPT37X is not set +# CONFIG_SCSI_PATA_HPT3X2N is not set +# CONFIG_SCSI_PATA_HPT3X3 is not set +# CONFIG_SCSI_PATA_ISAPNP is not set +# CONFIG_SCSI_PATA_IT8172 is not set +# CONFIG_SCSI_PATA_IT821X is not set +# CONFIG_SCSI_PATA_LEGACY is not set +# CONFIG_SCSI_PATA_MPIIX is not set +# CONFIG_SCSI_PATA_NETCELL is not set +# CONFIG_SCSI_PATA_OLDPIIX is not set +# CONFIG_SCSI_PATA_OPTI is not set +# CONFIG_SCSI_PATA_PCMCIA is not set +# CONFIG_SCSI_PATA_QDI is not set +# CONFIG_SCSI_PATA_RZ1000 is not set +# CONFIG_SCSI_PATA_SC1200 is not set +# CONFIG_SCSI_PATA_SERVERWORKS is not set +# CONFIG_SCSI_PATA_SIL680 is not set +# CONFIG_SCSI_PATA_SIS is not set +# CONFIG_SCSI_PATA_TRIFLEX is not set +# CONFIG_SCSI_PATA_VIA is not set +# CONFIG_SCSI_PATA_WINBOND is not set # CONFIG_SCSI_DMX3191D is not set # CONFIG_SCSI_FUTURE_DOMAIN is not set # CONFIG_SCSI_IPS is not set @@ -1093,6 +1087,16 @@ CONFIG_HWMON=y # Multimedia Capabilities Port drivers # +# +# LED devices +# +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_IXP4XX=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_CPU_ACTIVITY=y + # # Multimedia devices # @@ -1294,7 +1298,6 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_DEBUG is not set # CONFIG_USB_STORAGE_DATAFAB is not set # CONFIG_USB_STORAGE_FREECOM is not set -# CONFIG_USB_STORAGE_ISD200 is not set # CONFIG_USB_STORAGE_DPCM is not set # CONFIG_USB_STORAGE_USBAT is not set # CONFIG_USB_STORAGE_SDDR09 is not set diff --git a/packages/linux/ixp4xx-kernel_2.6.15.2.bb b/packages/linux/ixp4xx-kernel_2.6.15.2.bb index 10163296b6..19bd49a224 100644 --- a/packages/linux/ixp4xx-kernel_2.6.15.2.bb +++ b/packages/linux/ixp4xx-kernel_2.6.15.2.bb @@ -43,6 +43,7 @@ IXP4XX_PATCHES += "file://50-nas100d-arch.patch;patch=1" # IXP4XX_PATCHES += "file://60-nas100d-rtc.patch;patch=1" IXP4XX_PATCHES += "file://60-ixp4xx-beeper.patch;patch=1" IXP4XX_PATCHES += "file://65-loft-config.patch;patch=1" +IXP4XX_PATCHES += "file://80-nas100d-fix-i2c.patch;patch=1" IXP4XX_PATCHES += "file://81-nslu2-power.patch;patch=1" IXP4XX_PATCHES += "file://82-nas100d-power.patch;patch=1" IXP4XX_PATCHES += "file://85-timer.patch;patch=1" diff --git a/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb b/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb index ccb37b0776..4358fe536a 100644 --- a/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb +++ b/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb @@ -25,6 +25,7 @@ IXP4XX_PATCHES += "file://15-jffs2-endian-config.patch;patch=1" IXP4XX_PATCHES += "${RPSRC}/led_core-r11.patch;patch=1" IXP4XX_PATCHES += "${RPSRC}/led_triggers-r9.patch;patch=1" IXP4XX_PATCHES += "${RPSRC}/led_trig_timer-r4.patch;patch=1" +# IXP4XX_PATCHES += "${RPSRC}/led_trig_sharpsl_pm-r4a.patch;patch=1 IXP4XX_PATCHES += "${RPSRC}/led_zaurus-r8.patch;patch=1" IXP4XX_PATCHES += "${RPSRC}/led_locomo-r5.patch;patch=1" IXP4XX_PATCHES += "${RPSRC}/led_ixp4xx-r0.patch;patch=1" @@ -39,6 +40,7 @@ IXP4XX_PATCHES += "file://48-setup-byteswap-cmdline.patch;patch=1" IXP4XX_PATCHES += "file://61-ixp4xx-beeper-irq.patch;patch=1" IXP4XX_PATCHES += "file://61-nslu2-beeper.patch;patch=1" IXP4XX_PATCHES += "file://65-loft-config.patch;patch=1" +IXP4XX_PATCHES += "file://80-nas100d-fix-i2c.patch;patch=1" IXP4XX_PATCHES += "file://81-nslu2-power.patch;patch=1" IXP4XX_PATCHES += "file://82-nas100d-power.patch;patch=1" IXP4XX_PATCHES += "file://85-timer.patch;patch=1" @@ -49,7 +51,13 @@ IXP4XX_PATCHES += "file://92-nslu2-maclist.patch;patch=1" # IXP4XX_PATCHES += "file://93-loft-maclist.patch;patch=1" IXP4XX_PATCHES += "file://94-nas100d-setup.patch;patch=1" IXP4XX_PATCHES += "file://94-nslu2-setup.patch;patch=1" +IXP4XX_PATCHES += "file://94-loft-setup.patch;patch=1" # 96-loft-leds is still required, but does not apply cleanly. # IXP4XX_PATCHES += "file://96-loft-leds.patch;patch=1" IXP4XX_PATCHES += "file://96-nas100d-leds.patch;patch=1" IXP4XX_PATCHES += "file://96-nslu2-leds.patch;patch=1" +IXP4XX_PATCHES += "file://97-ds101-includes.patch;patch=1" +IXP4XX_PATCHES += "file://97-ds101-misc.patch;patch=1" +IXP4XX_PATCHES += "file://97-ds101-pci.patch;patch=1" +IXP4XX_PATCHES += "file://97-ds101-power.patch;patch=1" +IXP4XX_PATCHES += "file://97-ds101-setup.patch;patch=1" -- cgit v1.2.3 From ada160dc6fb45bb99f851d241f060e369fa9b3a3 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 11 Feb 2006 12:21:46 +0000 Subject: disapproval of revision '20f5c236b9ebdf5e2fc0e5acea55f39e77588bb8' --- packages/ixp4xx/ixp-osal-2.1/ixp4xx-header.patch | 10 +- packages/linux/ixp4xx-kernel.inc | 16 -- .../ixp4xx-kernel/2.6.16/80-nas100d-fix-i2c.patch | 16 -- .../linux/ixp4xx-kernel/2.6.16/94-loft-setup.patch | 154 ----------- .../ixp4xx-kernel/2.6.16/94-nas100d-setup.patch | 11 +- .../ixp4xx-kernel/2.6.16/97-ds101-includes.patch | 102 -------- .../linux/ixp4xx-kernel/2.6.16/97-ds101-misc.patch | 27 -- .../linux/ixp4xx-kernel/2.6.16/97-ds101-pci.patch | 73 ------ .../ixp4xx-kernel/2.6.16/97-ds101-power.patch | 75 ------ .../ixp4xx-kernel/2.6.16/97-ds101-setup.patch | 288 --------------------- packages/linux/ixp4xx-kernel/2.6.16/defconfig | 117 ++++----- packages/linux/ixp4xx-kernel_2.6.15.2.bb | 1 - packages/linux/ixp4xx-kernel_2.6.16-rc2.bb | 8 - 13 files changed, 64 insertions(+), 834 deletions(-) delete mode 100644 packages/linux/ixp4xx-kernel/2.6.16/80-nas100d-fix-i2c.patch delete mode 100644 packages/linux/ixp4xx-kernel/2.6.16/94-loft-setup.patch delete mode 100644 packages/linux/ixp4xx-kernel/2.6.16/97-ds101-includes.patch delete mode 100644 packages/linux/ixp4xx-kernel/2.6.16/97-ds101-misc.patch delete mode 100644 packages/linux/ixp4xx-kernel/2.6.16/97-ds101-pci.patch delete mode 100644 packages/linux/ixp4xx-kernel/2.6.16/97-ds101-power.patch delete mode 100644 packages/linux/ixp4xx-kernel/2.6.16/97-ds101-setup.patch diff --git a/packages/ixp4xx/ixp-osal-2.1/ixp4xx-header.patch b/packages/ixp4xx/ixp-osal-2.1/ixp4xx-header.patch index a9d87d4b56..70eec5e728 100644 --- a/packages/ixp4xx/ixp-osal-2.1/ixp4xx-header.patch +++ b/packages/ixp4xx/ixp-osal-2.1/ixp4xx-header.patch @@ -32,14 +32,13 @@ "qMgr" /* name */ --- ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Base.h 1970-01-01 00:00:00.000000000 +0000 +++ ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Base.h 1970-01-01 00:00:00.000000000 +0000 -@@ -0,0 +1,80 @@ +@@ -0,0 +1,72 @@ +/* + * Glue for the current linux definitons of this stuff. + */ +#ifndef IxOsalOsIxp425Base_H +#define IxOsalOsIxp425Base_H 1 +#include -+#include + +/* Force Address Coherent (the default) mapping on LE - Linux 2.6 + * does not have a way of changing it. @@ -65,14 +64,7 @@ +#define IXP425_PCI_CFG_BASE_PHYS IXP4XX_PCI_CFG_BASE_PHYS + +//#define IXP425_EXP_BUS_BASE1_PHYS -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16) +#define IXP425_EXP_BUS_BASE2_PHYS IXP4XX_EXP_BUS_CS2_BASE_PHYS -+#else -+/* The following definition should be IXP4XX_EXP_BUS_BASE(2), but that is not -+ static and causes compilation problems later. So we need to hard-code it. -+ Note that this hard-coded value is only correct for IXP42X. */ -+#define IXP425_EXP_BUS_BASE2_PHYS (IXP4XX_EXP_BUS_BASE_PHYS + (2 * SZ_16M)) -+#endif +//#define IXP425_EXP_BUS_CS0_BASE_PHYS +//#define IXP425_EXP_BUS_CS1_BASE_PHYS +//#define IXP425_EXP_BUS_CS4_BASE_PHYS diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc index d5defebd7b..29b32e80d8 100644 --- a/packages/linux/ixp4xx-kernel.inc +++ b/packages/linux/ixp4xx-kernel.inc @@ -269,20 +269,6 @@ pkg_postrm_kernel-image-loft () { update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${ARCH_BYTE_SEX}-${KERNEL_RELEASE} || true } -# The correct settings for the DS101 board: -ds101_MACHID = "833" -PACKAGES += "kernel-image-ds101" -PKG_kernel-image-ds101 = "kernel-image-${KERNEL_VERSION}" -PACKAGE_ARCH_kernel-image-ds101 = "ds101${ARCH_BYTE_SEX}" -DESCRIPTION_kernel-image-ds101 = "Linux kernel for the Synology DS101" -FILES_kernel-image-ds101 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-ds101${ARCH_BYTE_SEX}-${KERNEL_RELEASE}" -pkg_postinst_kernel-image-ds101 () { - update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-ds101${ARCH_BYTE_SEX}-${KERNEL_RELEASE} ${KERNEL_PRIORITY} || true -} -pkg_postrm_kernel-image-ds101 () { - update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-ds101${ARCH_BYTE_SEX}-${KERNEL_RELEASE} || true -} - # The correct settings for the NAS100D board: nas100d_MACHID = "865" PACKAGES += "kernel-image-nas100d" @@ -343,7 +329,6 @@ do_install_append() { # Add the machine specific images, with appropriate suffixes install_image 'nslu2${ARCH_BYTE_SEX}' '${nslu2_MACHID}' install_image 'loft${ARCH_BYTE_SEX}' '${loft_MACHID}' - install_image 'ds101${ARCH_BYTE_SEX}' '${ds101_MACHID}' install_image 'nas100d${ARCH_BYTE_SEX}' '${nas100d_MACHID}' } @@ -360,7 +345,6 @@ do_deploy() { # And the machine specific images deploy_image 'nslu2${ARCH_BYTE_SEX}' '${nslu2_MACHID}' deploy_image 'loft${ARCH_BYTE_SEX}' '${loft_MACHID}' - deploy_image 'ds101${ARCH_BYTE_SEX}' '${ds101_MACHID}' deploy_image 'nas100d${ARCH_BYTE_SEX}' '${nas100d_MACHID}' } diff --git a/packages/linux/ixp4xx-kernel/2.6.16/80-nas100d-fix-i2c.patch b/packages/linux/ixp4xx-kernel/2.6.16/80-nas100d-fix-i2c.patch deleted file mode 100644 index 6610cc0872..0000000000 --- a/packages/linux/ixp4xx-kernel/2.6.16/80-nas100d-fix-i2c.patch +++ /dev/null @@ -1,16 +0,0 @@ - include/asm-arm/arch-ixp4xx/nas100d.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- linux-nslu2.orig/include/asm-arm/arch-ixp4xx/nas100d.h 2006-02-06 20:37:38.000000000 +0100 -+++ linux-nslu2/include/asm-arm/arch-ixp4xx/nas100d.h 2006-02-09 14:33:49.000000000 +0100 -@@ -19,8 +19,8 @@ - #error "Do not include this directly, instead #include " - #endif - --#define NAS100D_SDA_PIN 6 --#define NAS100D_SCL_PIN 5 -+#define NAS100D_SDA_PIN 5 -+#define NAS100D_SCL_PIN 6 - - /* - * NAS100D PCI IRQs diff --git a/packages/linux/ixp4xx-kernel/2.6.16/94-loft-setup.patch b/packages/linux/ixp4xx-kernel/2.6.16/94-loft-setup.patch deleted file mode 100644 index e84508b85b..0000000000 --- a/packages/linux/ixp4xx-kernel/2.6.16/94-loft-setup.patch +++ /dev/null @@ -1,154 +0,0 @@ - arch/arm/mach-ixp4xx/ixdp425-setup.c | 115 ++++++++++++++++++++++++++++++++++- - 1 file changed, 112 insertions(+), 3 deletions(-) - ---- linux-nslu2.orig/arch/arm/mach-ixp4xx/ixdp425-setup.c 2006-02-10 18:03:51.000000000 +0100 -+++ linux-nslu2/arch/arm/mach-ixp4xx/ixdp425-setup.c 2006-02-10 18:06:40.000000000 +0100 -@@ -15,6 +15,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -25,6 +26,10 @@ - #include - #include - -+#ifdef CONFIG_MACLIST -+#include -+#endif -+ - static struct flash_platform_data ixdp425_flash_data = { - .map_name = "cfi_probe", - .width = 2, -@@ -176,17 +181,122 @@ MACHINE_START(AVILA, "Gateworks Avila Ne - MACHINE_END - #endif - -+#ifdef CONFIG_MACH_LOFT - /* - * Loft is functionally equivalent to Avila except that it has a - * different number for the maximum PCI devices. The MACHINE -- * structure below is identical to Avila except for the comment. -+ * structure below is derived from the Avila one (and may, in -+ * fact, be useful on Avila in general). -+ * -+ * The loft init registers a notifier on the on-board EEPROM to -+ * detect the MAC addresses. -+ * NOTE: this probably works for all Gateworks Avila boards and -+ * maybe the ixdp425 too. -+ * -+ * When the EEPROM is added the MAC address are read from it. - */ --#ifdef CONFIG_MACH_LOFT -+ -+#if defined(CONFIG_SENSORS_EEPROM) && defined(CONFIG_MACLIST) -+static void loft_eeprom_add(int address, int kind, struct kobject *kobj, -+ struct bin_attribute *eeprom_attr) { -+ /* The MACs are the first 12 bytes in the eeprom at address 0x51 */ -+ if (address == 0x51) { -+ ssize_t retlen; -+ char data[12]; -+ -+ /* Two Macs, one at 0, the other at 6, maclist_add will -+ * complain if the ID is not a valid MAC. -+ */ -+ retlen = eeprom_attr->read(kobj, data, 0, sizeof data); -+ if (retlen >= 6) { -+ u8 mac[6]; -+ memcpy(mac, data+0, sizeof mac); -+ printk(KERN_INFO "LOFT MAC[0]: %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n", -+ mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); -+ maclist_add(mac); -+ } -+ if (retlen >= 12) { -+ u8 mac[6]; -+ memcpy(mac, data+6, sizeof mac); -+ printk(KERN_INFO "LOFT MAC[1]: %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n", -+ mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); -+ maclist_add(mac); -+ } -+ } -+} -+ -+static struct eeprom_notifier loft_eeprom_notifier = { -+ .add = loft_eeprom_add -+}; -+#endif -+ -+/* -+ * Loft bootstrap may pass in parameters, if these contain an -+ * ATAG_MEM and it appears valid (not the 16MByte one in the -+ * setup/kernel.c default) we use it, otherwise a 64MByte -+ * setting is forced here, this may be overridden on the -+ * command line. -+ */ -+static void __init loft_fixup(struct machine_desc *desc, -+ struct tag *tags, char **cmdline, struct meminfo *mi) -+{ -+ char saved_command_line[COMMAND_LINE_SIZE]; -+ -+ /* Put Loft specific known-required-for-certain stuff here, leave -+ * a trailing space! -+ */ -+ static char loft_command_line[] = -+ "root=/dev/mtdblock2 rw rootfstype=jffs2 init=/linuxrc " -+ "rtc-ds1672.probe=0,0x68 "; -+ const int len = (sizeof loft_command_line) - 1; -+ int memtag = 0; -+ -+ /* The EEPROM has two ethernet MACs embedded in it which we need, -+ * that is all this notifier does. -+ */ -+#ifdef CONFIG_SENSORS_EEPROM -+ register_eeprom_user(&loft_eeprom_notifier); -+#endif -+ -+ /* The Loft typically has one bank of 64MByte memory. -+ * NOTE: setting nr_banks != 0 causes kernel/setup.c to remove -+ * the mem tags from the tag list, so if there is an entry -+ * there don't remove it! -+ */ -+ if (tags->hdr.tag == ATAG_CORE) do { -+ tags = tag_next(tags); -+ printk(KERN_NOTICE "ATAG[0x%x] size %d\n", tags->hdr.tag, tags->hdr.size); -+ if (tags->hdr.tag == ATAG_MEM && tags->hdr.size == tag_size(tag_mem32) && -+ (tags->u.mem.start != 0 || tags->u.mem.size != (16*1024*1024))) { -+ memtag = 1; -+ printk(KERN_NOTICE " ATAG_MEM base %x, size %dMB\n", -+ tags->u.mem.start, -+ tags->u.mem.size / (1024*1024)); -+ } -+ } while (tags->hdr.size); -+ -+ if (!memtag) { -+ mi->nr_banks = 1; -+ mi->bank[0].start = 0; -+ mi->bank[0].size = (64*1024*1024); -+ mi->bank[0].node = PHYS_TO_NID(0); -+ } -+ -+ /* A command line in the ATAG list will override this one, -+ * as is intended. -+ */ -+ memcpy(saved_command_line, *cmdline, COMMAND_LINE_SIZE); -+ memcpy(*cmdline, loft_command_line, len); -+ memcpy(*cmdline + len, saved_command_line, COMMAND_LINE_SIZE - len); -+ *cmdline[COMMAND_LINE_SIZE-1] = 0; -+} -+ - MACHINE_START(LOFT, "Giant Shoulder Inc Loft board") - /* Maintainer: Tom Billman */ - .phys_ram = PHYS_OFFSET, - .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, - .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, -+ .fixup = loft_fixup, - .map_io = ixp4xx_map_io, - .init_irq = ixp4xx_init_irq, - .timer = &ixp4xx_timer, -@@ -194,4 +304,3 @@ MACHINE_START(LOFT, "Giant Shoulder Inc - .init_machine = ixdp425_init, - MACHINE_END - #endif -- diff --git a/packages/linux/ixp4xx-kernel/2.6.16/94-nas100d-setup.patch b/packages/linux/ixp4xx-kernel/2.6.16/94-nas100d-setup.patch index b9c4c265d0..bc7bf2061a 100644 --- a/packages/linux/ixp4xx-kernel/2.6.16/94-nas100d-setup.patch +++ b/packages/linux/ixp4xx-kernel/2.6.16/94-nas100d-setup.patch @@ -4,11 +4,11 @@ in the boot loader. Signed-off-by: John Bowler - arch/arm/mach-ixp4xx/nas100d-setup.c | 42 +++++++++++++++++++++++++++++++++++ - 1 file changed, 42 insertions(+) + arch/arm/mach-ixp4xx/nas100d-setup.c | 43 +++++++++++++++++++++++++++++++++++ + 1 file changed, 43 insertions(+) ---- linux-nslu2.orig/arch/arm/mach-ixp4xx/nas100d-setup.c 2006-02-09 13:24:19.000000000 +0100 -+++ linux-nslu2/arch/arm/mach-ixp4xx/nas100d-setup.c 2006-02-09 15:13:56.000000000 +0100 +--- linux-nslu2.orig/arch/arm/mach-ixp4xx/nas100d-setup.c 2006-02-06 22:35:26.000000000 +0100 ++++ linux-nslu2/arch/arm/mach-ixp4xx/nas100d-setup.c 2006-02-06 22:40:20.000000000 +0100 @@ -17,6 +17,8 @@ #include #include @@ -18,7 +18,7 @@ Signed-off-by: John Bowler #include #include #include -@@ -161,11 +163,51 @@ static void __init nas100d_init(void) +@@ -161,11 +163,52 @@ static void __init nas100d_init(void) platform_add_devices(nas100d_devices, ARRAY_SIZE(nas100d_devices)); } @@ -41,6 +41,7 @@ Signed-off-by: John Bowler + */ +static char nas100d_command_line[] __initdata = + "root=/dev/mtdblock2 rootfstype=jffs2 init=/linuxrc " ++ "pcf8563.hctosys=1 " + CONFIG_CMDLINE; + +static void __init nas100d_fixup(struct machine_desc *desc, diff --git a/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-includes.patch b/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-includes.patch deleted file mode 100644 index d9a5f07494..0000000000 --- a/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-includes.patch +++ /dev/null @@ -1,102 +0,0 @@ -diff -ruN linux-2.6.15.orig/include/asm-arm/arch-ixp4xx/hardware.h linux-2.6.15.new/include/asm-arm/arch-ixp4xx/hardware.h ---- linux-2.6.15.orig/include/asm-arm/arch-ixp4xx/hardware.h 2006-02-11 02:58:47.000000000 +0100 -+++ linux-2.6.15.new/include/asm-arm/arch-ixp4xx/hardware.h 2006-02-10 22:26:54.000000000 +0100 -@@ -46,5 +46,6 @@ - #include "prpmc1100.h" - #include "nslu2.h" - #include "nas100d.h" -+#include "ds101.h" - - #endif /* _ASM_ARCH_HARDWARE_H */ -diff -ruN linux-2.6.15.orig/include/asm-arm/arch-ixp4xx/irqs.h linux-2.6.15.new/include/asm-arm/arch-ixp4xx/irqs.h ---- linux-2.6.15.orig/include/asm-arm/arch-ixp4xx/irqs.h 2006-02-11 02:58:47.000000000 +0100 -+++ linux-2.6.15.new/include/asm-arm/arch-ixp4xx/irqs.h 2006-02-10 22:56:11.000000000 +0100 -@@ -108,5 +108,12 @@ - #define IRQ_NAS100D_PCI_INTC IRQ_IXP4XX_GPIO9 - #define IRQ_NAS100D_PCI_INTD IRQ_IXP4XX_GPIO8 - #define IRQ_NAS100D_PCI_INTE IRQ_IXP4XX_GPIO7 -+/* -+ * DS101 board IRQs -+ */ -+ -+#define IRQ_DS101_PCI_INTA IRQ_IXP4XX_GPIO11 -+#define IRQ_DS101_PCI_INTB IRQ_IXP4XX_GPIO10 -+#define IRQ_DS101_PCI_INTC IRQ_IXP4XX_GPIO9 - - #endif -diff -ruN linux-2.6.15.orig/include/asm-arm/arch/ds101.h linux-2.6.15.new/include/asm-arm/arch/ds101.h ---- linux-2.6.15.orig/include/asm-arm/arch-ixp4xx/ds101.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.15.new/include/asm-arm/arch-ixp4xx/ds101.h 2006-02-10 22:16:24.000000000 +0100 -@@ -0,0 +1,72 @@ -+/* -+ * include/asm-arm/arch-ixp4xx/ds101.h -+ * -+ * DS101 platform specific definitions -+ * -+ * Copyright (c) 2005 Tower Technologies -+ * -+ * Author: Alessandro Zummo -+ * -+ * based on ixdp425.h: -+ * Copyright 2004 (c) MontaVista, Software, Inc. -+ * -+ * This file is licensed under the terms of the GNU General Public -+ * License version 2. This program is licensed "as is" without any -+ * warranty of any kind, whether express or implied. -+ */ -+ -+#ifndef __ASM_ARCH_HARDWARE_H__ -+#error "Do not include this directly, instead #include " -+#endif -+ -+#define DS101_SDA_PIN 1 -+#define DS101_SCL_PIN 0 -+ -+/* -+ * DS101 PCI IRQs -+ */ -+#define DS101_PCI_MAX_DEV 3 -+#define DS101_PCI_IRQ_LINES 3 -+ -+ -+/* PCI controller GPIO to IRQ pin mappings */ -+#define DS101_PCI_INTA_PIN 11 -+#define DS101_PCI_INTB_PIN 10 -+#define DS101_PCI_INTC_PIN 9 -+// #define DS101_PCI_INTD_PIN 8 -+// #define DS101_PCI_INTE_PIN 7 -+ -+/* GPIO */ -+ -+#define DS101_GPIO0 0 -+#define DS101_GPIO1 1 -+#define DS101_GPIO2 2 -+#define DS101_GPIO3 3 -+#define DS101_GPIO4 4 -+#define DS101_GPIO5 5 -+#define DS101_GPIO6 6 -+#define DS101_GPIO7 7 -+#define DS101_GPIO8 8 -+#define DS101_GPIO9 9 -+#define DS101_GPIO10 10 -+#define DS101_GPIO11 11 -+#define DS101_GPIO12 12 -+#define DS101_GPIO13 13 -+#define DS101_GPIO14 14 -+#define DS101_GPIO15 15 -+ -+ -+/* Buttons */ -+ -+#define DS101_PB_GPIO DS101_GPIO8 -+#define DS101_RB_GPIO DS101_GPIO12 -+#define DS101_PO_GPIO DS101_GPIO7 /* power off */ -+ -+#define DS101_PB_IRQ IRQ_IXP4XX_GPIO8 -+#define DS101_RB_IRQ IRQ_IXP4XX_GPIO12 -+ -+/* -+#define DS101_PB_BM (1L << DS101_PB_GPIO) -+#define DS101_PO_BM (1L << DS101_PO_GPIO) -+#define DS101_RB_BM (1L << DS101_RB_GPIO) -+*/ diff --git a/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-misc.patch b/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-misc.patch deleted file mode 100644 index ea5f91b45f..0000000000 --- a/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-misc.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ruN linux-2.6.15.orig/arch/arm/mach-ixp4xx/Makefile linux-2.6.15.new/arch/arm/mach-ixp4xx/Makefile ---- linux-2.6.15.orig/arch/arm/mach-ixp4xx/Makefile 2006-02-11 02:57:58.000000000 +0100 -+++ linux-2.6.15.new/arch/arm/mach-ixp4xx/Makefile 2006-02-10 22:13:27.000000000 +0100 -@@ -10,4 +10,4 @@ - obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-pci.o gtwx5715-setup.o - obj-$(CONFIG_MACH_NSLU2) += nslu2-pci.o nslu2-setup.o nslu2-power.o - obj-$(CONFIG_MACH_NAS100D) += nas100d-pci.o nas100d-setup.o nas100d-power.o -- -+obj-$(CONFIG_MACH_DS101) += ds101-pci.o ds101-setup.o ds101-power.o -diff -ruN linux-2.6.15.orig/arch/arm/mach-ixp4xx/Kconfig linux-2.6.15.new/arch/arm/mach-ixp4xx/Kconfig ---- linux-2.6.15.orig/arch/arm/mach-ixp4xx/Kconfig 2006-02-11 03:00:07.000000000 +0100 -+++ linux-2.6.15.new/arch/arm/mach-ixp4xx/Kconfig 2006-02-10 22:21:09.000000000 +0100 -@@ -86,6 +86,14 @@ - NAS 100d device. For more information on this platform, - see http://www.nslu2-linux.org/wiki/NAS100d/HomePage - -+config MACH_DS101 -+ bool -+ prompt "DS101" -+ help -+ Say 'Y' here if you want your kernel to support Synology's -+ DiskStation DS101(j) device. For more information on this -+ platform see http://www.nslu2-linux.org/wiki/DS101/HomePage -+ - # - # Avila and IXDP share the same source for now. Will change in future - # diff --git a/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-pci.patch b/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-pci.patch deleted file mode 100644 index 8940bd63a6..0000000000 --- a/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-pci.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -ruN linux-2.6.15.orig/arch/arm/mach-ixp4xx/ds101-pci.c linux-2.6.15.new/arch/arm/mach-ixp4xx/ds101-pci.c ---- linux-2.6.15.orig/arch/arm/mach-ixp4xx/ds101-pci.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.15.new/arch/arm/mach-ixp4xx/ds101-pci.c 2006-02-10 22:31:00.000000000 +0100 -@@ -0,0 +1,69 @@ -+/* -+ * arch/arm/mach-ixp4xx/ds101-pci.c -+ * -+ * DS101 board-level PCI initialization -+ * -+ * based on ixdp425-pci.c: -+ * Copyright (C) 2002 Intel Corporation. -+ * Copyright (C) 2003-2004 MontaVista Software, Inc. -+ * -+ * Maintainer: http://www.nslu2-linux.org/ -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ * -+ */ -+ -+#include -+#include -+#include -+ -+#include -+#include -+ -+void __init ds101_pci_preinit(void) -+{ -+ set_irq_type(IRQ_DS101_PCI_INTA, IRQT_LOW); -+ set_irq_type(IRQ_DS101_PCI_INTB, IRQT_LOW); -+ set_irq_type(IRQ_DS101_PCI_INTC, IRQT_LOW); -+ -+ ixp4xx_pci_preinit(); -+} -+ -+static int __init ds101_map_irq(struct pci_dev *dev, u8 slot, u8 pin) -+{ -+ static int pci_irq_table[DS101_PCI_MAX_DEV][DS101_PCI_IRQ_LINES] = -+ { -+ { IRQ_DS101_PCI_INTA, -1, -1 }, -+ { IRQ_DS101_PCI_INTB, -1, -1 }, -+ { IRQ_DS101_PCI_INTC, -1, -1 }, -+ }; -+ -+ int irq = -1; -+ -+ if (slot >= 1 && slot <= DS101_PCI_MAX_DEV && -+ pin >= 1 && pin <= DS101_PCI_IRQ_LINES) -+ irq = pci_irq_table[slot-1][pin-1]; -+ -+ return irq; -+} -+ -+struct hw_pci __initdata ds101_pci = { -+ .nr_controllers = 1, -+ .preinit = ds101_pci_preinit, -+ .swizzle = pci_std_swizzle, -+ .setup = ixp4xx_setup, -+ .scan = ixp4xx_scan_bus, -+ .map_irq = ds101_map_irq, -+}; -+ -+int __init ds101_pci_init(void) -+{ -+ if (machine_is_ds101()) -+ pci_common_init(&ds101_pci); -+ -+ return 0; -+} -+ -+subsys_initcall(ds101_pci_init); diff --git a/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-power.patch b/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-power.patch deleted file mode 100644 index 3c309f3536..0000000000 --- a/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-power.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -ruN linux-2.6.15.orig/arch/arm/mach-ixp4xx/ds101-power.c linux-2.6.15.new/arch/arm/mach-ixp4xx/ds101-power.c ---- linux-2.6.15.orig/arch/arm/mach-ixp4xx/ds101-power.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.15.new/arch/arm/mach-ixp4xx/ds101-power.c 2006-02-10 23:54:40.000000000 +0100 -@@ -0,0 +1,71 @@ -+/* -+ * arch/arm/mach-ixp4xx/ds101-power.c -+ * -+ * DS101 Power/Reset driver -+ * -+ * Copyright (C) 2005 Tower Technologies -+ * -+ * based on ds101-io.c -+ * Copyright (C) 2004 Karen Spearel -+ * -+ * Author: Alessandro Zummo -+ * Author: OEyvind Repvik -+ * Maintainers: http://www.nslu2-linux.org/ -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ * -+ */ -+ -+#include -+#include -+#include -+ -+#include -+ -+extern void ctrl_alt_del(void); -+ -+static irqreturn_t ds101_reset_handler(int irq, void *dev_id, struct pt_regs *regs) -+{ -+ /* Signal init to do the ctrlaltdel action, this will bypass init if -+ * it hasn't started and do a kernel_restart. -+ */ -+ ctrl_alt_del(); -+ -+ return IRQ_HANDLED; -+} -+ -+static int __init ds101_power_init(void) -+{ -+ if (!(machine_is_ds101())) -+ return 0; -+ -+ set_irq_type(DS101_RB_IRQ, IRQT_LOW); -+ -+ if (request_irq(DS101_RB_IRQ, &ds101_reset_handler, -+ SA_INTERRUPT, "DS101 reset button", NULL) < 0) { -+ -+ printk(KERN_DEBUG "Reset Button IRQ %d not available\n", -+ DS101_RB_IRQ); -+ -+ return -EIO; -+ } -+ -+ return 0; -+} -+ -+static void __exit ds101_power_exit(void) -+{ -+ if (!(machine_is_ds101())) -+ return; -+ -+ free_irq(DS101_RB_IRQ, NULL); -+} -+ -+module_init(ds101_power_init); -+module_exit(ds101_power_exit); -+ -+MODULE_AUTHOR("Alessandro Zummo "); -+MODULE_DESCRIPTION("DS101 Power/Reset driver"); -+MODULE_LICENSE("GPL"); diff --git a/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-setup.patch b/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-setup.patch deleted file mode 100644 index ac3f7d19c7..0000000000 --- a/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-setup.patch +++ /dev/null @@ -1,288 +0,0 @@ -diff -ruN linux-2.6.15.orig/arch/arm/mach-ixp4xx/ds101-setup.c linux-2.6.15.new/arch/arm/mach-ixp4xx/ds101-setup.c ---- linux-2.6.15.orig/arch/arm/mach-ixp4xx/ds101-setup.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.15.new/arch/arm/mach-ixp4xx/ds101-setup.c 2006-02-11 02:17:35.000000000 +0100 -@@ -0,0 +1,284 @@ -+/* -+ * arch/arm/mach-ixp4xx/ds101-setup.c -+ * -+ * DS 101 board-setup -+ * -+ * based ixdp425-setup.c: -+ * Copyright (C) 2003-2004 MontaVista Software, Inc. -+ * -+ * Author: Alessandro Zummo -+ * Author: Rod Whitby -+ * Author: OEyvind Repvik -+ * Maintainers: http://www.nslu2-linux.org/ -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+ -+#include -+ -+static struct flash_platform_data ds101_flash_data = { -+ .map_name = "cfi_probe", -+ .width = 2, -+}; -+ -+static struct resource ds101_flash_resource = { -+ .flags = IORESOURCE_MEM, -+}; -+ -+static struct platform_device ds101_flash = { -+ .name = "IXP4XX-Flash", -+ .id = 0, -+ .dev.platform_data = &ds101_flash_data, -+ .num_resources = 1, -+ .resource = &ds101_flash_resource, -+}; -+ -+#ifdef CONFIG_LEDS_CLASS -+static struct resource ds101_led_resources[] = { -+ { -+ .name = "power", /* blue power led */ -+ .start = 3, -+ .end = 3, -+ .flags = IXP4XX_GPIO_LOW, -+ }, -+ { -+ .name = "status-1", -+ .start = 14, -+ .end = 14, -+ .flags = IXP4XX_GPIO_LOW, -+ }, -+ { -+ .name = "status-2", -+ .start = 15, -+ .end = 15, -+ .flags = IXP4XX_GPIO_LOW, -+ }, -+ { -+ .name = "usb-1", /* The usb-copy-button led */ -+ .start = 5, -+ .end = 5, -+ .flags = IXP4XX_GPIO_LOW, -+ }, -+ { -+ .name = "usb-2", /* also the usb-copy-button led */ -+ .start = 4, -+ .end = 4, -+ .flags = IXP4XX_GPIO_LOW, -+ }, -+ { -+ .name = "test", -+ .start = 6, -+ .end = 6, -+ .flags = IXP4XX_GPIO_LOW, -+ }, -+}; -+ -+ -+static struct platform_device ds101_leds = { -+ .name = "IXP4XX-GPIO-LED", -+ .id = -1, -+ .num_resources = ARRAY_SIZE(ds101_led_resources), -+ .resource = ds101_led_resources, -+}; -+#endif -+ -+static struct ixp4xx_i2c_pins ds101_i2c_gpio_pins = { -+ .sda_pin = DS101_SDA_PIN, -+ .scl_pin = DS101_SCL_PIN, -+}; -+ -+static struct platform_device ds101_i2c_controller = { -+ .name = "IXP4XX-I2C", -+ .id = 0, -+ .dev.platform_data = &ds101_i2c_gpio_pins, -+ .num_resources = 0, -+}; -+ -+static struct platform_device ds101_beeper = { -+ .name = "ixp4xx-beeper", -+ .id = 2, -+ .num_resources = 0, -+}; -+ -+static struct resource ds101_uart_resources[] = { -+ { -+ .start = IXP4XX_UART1_BASE_PHYS, -+ .end = IXP4XX_UART1_BASE_PHYS + 0x0fff, -+ .flags = IORESOURCE_MEM, -+ }, -+ { -+ .start = IXP4XX_UART2_BASE_PHYS, -+ .end = IXP4XX_UART2_BASE_PHYS + 0x0fff, -+ .flags = IORESOURCE_MEM, -+ } -+}; -+ -+static struct plat_serial8250_port ds101_uart_data[] = { -+ { -+ .mapbase = IXP4XX_UART1_BASE_PHYS, -+ .membase = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET, -+ .irq = IRQ_IXP4XX_UART1, -+ .flags = UPF_BOOT_AUTOCONF, -+ .iotype = UPIO_MEM, -+ .regshift = 2, -+ .uartclk = IXP4XX_UART_XTAL, -+ }, -+ { -+ .mapbase = IXP4XX_UART2_BASE_PHYS, -+ .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, -+ .irq = IRQ_IXP4XX_UART2, -+ .flags = UPF_BOOT_AUTOCONF, -+ .iotype = UPIO_MEM, -+ .regshift = 2, -+ .uartclk = IXP4XX_UART_XTAL, -+ }, -+ { } -+}; -+ -+static struct platform_device ds101_uart = { -+ .name = "serial8250", -+ .id = PLAT8250_DEV_PLATFORM, -+ .dev.platform_data = ds101_uart_data, -+ .num_resources = 2, -+ .resource = ds101_uart_resources, -+}; -+ -+static struct platform_device *ds101_devices[] __initdata = { -+ &ds101_i2c_controller, -+ &ds101_flash, -+ &ds101_beeper, -+}; -+ -+static void ds101_power_off(void) -+{ -+ /* This causes the box to drop the power and go dead. */ -+ -+ /* enable the pwr cntl gpio */ -+ gpio_line_config(DS101_PO_GPIO, IXP4XX_GPIO_OUT); -+ -+ /* do the deed */ -+ gpio_line_set(DS101_PO_GPIO, IXP4XX_GPIO_HIGH); -+} -+ -+/* -+ * When the RedBoot config partition is added the MAC address is read from -+ * it. -+ * FIXME: This isn't correct on the DS101! -+ */ -+static void ds101_flash_add(struct mtd_info *mtd) { -+ if (strcmp(mtd->name, "RedBoot config") == 0) { -+ size_t retlen; -+ u_char mac[6]; -+ -+ /* The MAC is at a known offset... */ -+ if (mtd->read(mtd, 0x0FD8, 6, &retlen, mac) == 0 && retlen == 6) { -+ printk(KERN_INFO "DS101 MAC: %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n", -+ mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); -+ maclist_add(mac); -+ } else { -+ printk(KERN_ERR "DS101 MAC: read failed\n"); -+ } -+ } -+} -+ -+/* -+ * Nothing to do on remove at present. -+ */ -+static void ds101_flash_remove(struct mtd_info *mtd) { -+} -+ -+static struct mtd_notifier ds101_flash_notifier = { -+ .add = ds101_flash_add, -+ .remove = ds101_flash_remove, -+}; -+ -+static void __init ds101_init(void) -+{ -+ /* The flash has an ethernet MAC embedded in it which we need, -+ * that is all this notifier does. -+ */ -+ register_mtd_user(&ds101_flash_notifier); -+ -+ ixp4xx_sys_init(); -+ -+ ds101_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); -+ ds101_flash_resource.end = -+ IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1; -+ -+ pm_power_off = ds101_power_off; -+ -+ /* This is only useful on a modified machine, but it is valuable -+ * to have it first in order to see debug messages, and so that -+ * it does *not* get removed if platform_add_devices fails! -+ */ -+ (void)platform_device_register(&ds101_uart); -+ -+ platform_add_devices(ds101_devices, ARRAY_SIZE(ds101_devices)); -+ -+#ifdef CONFIG_LEDS_CLASS -+ /* We don't care whether or not this works. */ -+ (void)platform_device_register(&ds101_leds); -+#endif -+} -+ -+/* -+ * DS101 bootstrap may pass in parameters, but we zap the mem -+ * settings to be safe (the box always has 64MByte at 0). The -+ * passed in command line can override this default, we prepend -+ * to the config'ed default. -+ * -+ * NOTE: the startup sequence is: -+ * 1) Call the machine fixup -+ * 2) Parse the ATAG list, the ATAG_CMDLINE is copied in -+ * to default_command_line which is the value of *from -+ * 3) Parse the command line in *from (*not* -+ * default_command_line unless they are the same!) -+ * -+ * Setting mi->nr_banks causes (2) to 'squash' (set to ATAG_NONE) -+ * any ATAG_MEM tags, but mem= command line options cause nr_banks -+ * to be reset to 0 (on the first mem=) -+ */ -+static char ds101_command_line[] __initdata = -+ "root=/dev/sda1 rootfstype=ext3 init=/sbin/init " -+ CONFIG_CMDLINE; -+ -+static void __init ds101_fixup(struct machine_desc *desc, -+ struct tag *tags, char **cmdline, struct meminfo *mi) -+{ -+ /* The DS101 has one bank of 64MByte memory. -+ * NOTE: setting nr_banks != 0 causes kernel/setup.c to remove -+ * the mem tags from the tag list. We need do nothing here! -+ */ -+ mi->nr_banks=1; -+ mi->bank[0].start = 0; -+ mi->bank[0].size = (64*1024*1024); -+ mi->bank[0].node = PHYS_TO_NID(0); -+ -+ /* A command line in the ATAG list will override this one, -+ * as is intended. -+ */ -+ strlcpy(*cmdline, ds101_command_line, COMMAND_LINE_SIZE); -+} -+ -+MACHINE_START(DS101, "Synology DiskStation DS101") -+ /* Maintainer: www.nslu2-linux.org */ -+ .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, -+ .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xFFFC, -+ .boot_params = 0x00000100, -+ .fixup = ds101_fixup, -+ .map_io = ixp4xx_map_io, -+ .init_irq = ixp4xx_init_irq, -+ .timer = &ixp4xx_timer, -+ .init_machine = ds101_init, -+MACHINE_END diff --git a/packages/linux/ixp4xx-kernel/2.6.16/defconfig b/packages/linux/ixp4xx-kernel/2.6.16/defconfig index e7973518c7..25c2ba40c2 100644 --- a/packages/linux/ixp4xx-kernel/2.6.16/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.16/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16-rc2 -# Thu Feb 9 23:00:47 2006 +# Thu Feb 9 20:54:57 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -124,7 +124,6 @@ CONFIG_ARCH_IXDP425=y CONFIG_ARCH_IXCDP1100=y # CONFIG_ARCH_PRPMC1100 is not set CONFIG_MACH_NAS100D=y -CONFIG_MACH_DS101=y CONFIG_ARCH_IXDP4XX=y # CONFIG_MACH_GTWX5715 is not set @@ -584,7 +583,60 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8 # # ATA/ATAPI/MFM/RLL support # -# CONFIG_IDE is not set +CONFIG_IDE=y +CONFIG_BLK_DEV_IDE=y + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_BLK_DEV_IDEDISK=y +# CONFIG_IDEDISK_MULTI_MODE is not set +# CONFIG_BLK_DEV_IDECD is not set +# CONFIG_BLK_DEV_IDETAPE is not set +# CONFIG_BLK_DEV_IDEFLOPPY is not set +# CONFIG_BLK_DEV_IDESCSI is not set +# CONFIG_IDE_TASK_IOCTL is not set + +# +# IDE chipset support/bugfixes +# +CONFIG_IDE_GENERIC=y +CONFIG_BLK_DEV_IDEPCI=y +# CONFIG_IDEPCI_SHARE_IRQ is not set +# CONFIG_BLK_DEV_OFFBOARD is not set +# CONFIG_BLK_DEV_GENERIC is not set +# CONFIG_BLK_DEV_OPTI621 is not set +# CONFIG_BLK_DEV_SL82C105 is not set +CONFIG_BLK_DEV_IDEDMA_PCI=y +# CONFIG_BLK_DEV_IDEDMA_FORCED is not set +# CONFIG_IDEDMA_PCI_AUTO is not set +CONFIG_BLK_DEV_AEC62XX=y +# CONFIG_BLK_DEV_ALI15X3 is not set +# CONFIG_BLK_DEV_AMD74XX is not set +# CONFIG_BLK_DEV_CMD64X is not set +# CONFIG_BLK_DEV_TRIFLEX is not set +# CONFIG_BLK_DEV_CY82C693 is not set +# CONFIG_BLK_DEV_CS5520 is not set +# CONFIG_BLK_DEV_CS5530 is not set +# CONFIG_BLK_DEV_HPT34X is not set +# CONFIG_BLK_DEV_HPT366 is not set +# CONFIG_BLK_DEV_SC1200 is not set +# CONFIG_BLK_DEV_PIIX is not set +# CONFIG_BLK_DEV_IT821X is not set +# CONFIG_BLK_DEV_NS87415 is not set +# CONFIG_BLK_DEV_PDC202XX_OLD is not set +# CONFIG_BLK_DEV_PDC202XX_NEW is not set +# CONFIG_BLK_DEV_SVWKS is not set +# CONFIG_BLK_DEV_SIIMAGE is not set +# CONFIG_BLK_DEV_SLC90E66 is not set +# CONFIG_BLK_DEV_TRM290 is not set +# CONFIG_BLK_DEV_VIA82CXXX is not set +# CONFIG_IDE_ARM is not set +CONFIG_BLK_DEV_IDEDMA=y +# CONFIG_IDEDMA_IVB is not set +# CONFIG_IDEDMA_AUTO is not set +# CONFIG_BLK_DEV_HD is not set # # SCSI device support @@ -634,53 +686,7 @@ CONFIG_SCSI_MULTI_LUN=y # CONFIG_MEGARAID_NEWGEN is not set # CONFIG_MEGARAID_LEGACY is not set # CONFIG_MEGARAID_SAS is not set -CONFIG_SCSI_SATA=y -# CONFIG_SCSI_SATA_AHCI is not set -# CONFIG_SCSI_SATA_SVW is not set -# CONFIG_SCSI_ATA_PIIX is not set -# CONFIG_SCSI_SATA_MV is not set -# CONFIG_SCSI_SATA_NV is not set -# CONFIG_SCSI_PDC_ADMA is not set -# CONFIG_SCSI_SATA_QSTOR is not set -# CONFIG_SCSI_SATA_PROMISE is not set -# CONFIG_SCSI_SATA_SX4 is not set -# CONFIG_SCSI_SATA_SIL is not set -# CONFIG_SCSI_SATA_SIL24 is not set -# CONFIG_SCSI_SATA_SIS is not set -# CONFIG_SCSI_SATA_ULI is not set -# CONFIG_SCSI_SATA_VIA is not set -# CONFIG_SCSI_SATA_VITESSE is not set -# CONFIG_SCSI_PATA_ALI is not set -# CONFIG_SCSI_PATA_AMD is not set -CONFIG_SCSI_PATA_ARTOP=y -# CONFIG_SCSI_PATA_ATIIXP is not set -# CONFIG_SCSI_PATA_CMD64X is not set -# CONFIG_SCSI_PATA_CS5520 is not set -# CONFIG_SCSI_PATA_CS5530 is not set -# CONFIG_SCSI_PATA_CYPRESS is not set -# CONFIG_SCSI_PATA_EFAR is not set -# CONFIG_SCSI_ATA_GENERIC is not set -# CONFIG_SCSI_PATA_HPT37X is not set -# CONFIG_SCSI_PATA_HPT3X2N is not set -# CONFIG_SCSI_PATA_HPT3X3 is not set -# CONFIG_SCSI_PATA_ISAPNP is not set -# CONFIG_SCSI_PATA_IT8172 is not set -# CONFIG_SCSI_PATA_IT821X is not set -# CONFIG_SCSI_PATA_LEGACY is not set -# CONFIG_SCSI_PATA_MPIIX is not set -# CONFIG_SCSI_PATA_NETCELL is not set -# CONFIG_SCSI_PATA_OLDPIIX is not set -# CONFIG_SCSI_PATA_OPTI is not set -# CONFIG_SCSI_PATA_PCMCIA is not set -# CONFIG_SCSI_PATA_QDI is not set -# CONFIG_SCSI_PATA_RZ1000 is not set -# CONFIG_SCSI_PATA_SC1200 is not set -# CONFIG_SCSI_PATA_SERVERWORKS is not set -# CONFIG_SCSI_PATA_SIL680 is not set -# CONFIG_SCSI_PATA_SIS is not set -# CONFIG_SCSI_PATA_TRIFLEX is not set -# CONFIG_SCSI_PATA_VIA is not set -# CONFIG_SCSI_PATA_WINBOND is not set +# CONFIG_SCSI_SATA is not set # CONFIG_SCSI_DMX3191D is not set # CONFIG_SCSI_FUTURE_DOMAIN is not set # CONFIG_SCSI_IPS is not set @@ -1087,16 +1093,6 @@ CONFIG_HWMON=y # Multimedia Capabilities Port drivers # -# -# LED devices -# -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_IXP4XX=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_CPU_ACTIVITY=y - # # Multimedia devices # @@ -1298,6 +1294,7 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_DEBUG is not set # CONFIG_USB_STORAGE_DATAFAB is not set # CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set # CONFIG_USB_STORAGE_DPCM is not set # CONFIG_USB_STORAGE_USBAT is not set # CONFIG_USB_STORAGE_SDDR09 is not set diff --git a/packages/linux/ixp4xx-kernel_2.6.15.2.bb b/packages/linux/ixp4xx-kernel_2.6.15.2.bb index 19bd49a224..10163296b6 100644 --- a/packages/linux/ixp4xx-kernel_2.6.15.2.bb +++ b/packages/linux/ixp4xx-kernel_2.6.15.2.bb @@ -43,7 +43,6 @@ IXP4XX_PATCHES += "file://50-nas100d-arch.patch;patch=1" # IXP4XX_PATCHES += "file://60-nas100d-rtc.patch;patch=1" IXP4XX_PATCHES += "file://60-ixp4xx-beeper.patch;patch=1" IXP4XX_PATCHES += "file://65-loft-config.patch;patch=1" -IXP4XX_PATCHES += "file://80-nas100d-fix-i2c.patch;patch=1" IXP4XX_PATCHES += "file://81-nslu2-power.patch;patch=1" IXP4XX_PATCHES += "file://82-nas100d-power.patch;patch=1" IXP4XX_PATCHES += "file://85-timer.patch;patch=1" diff --git a/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb b/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb index 4358fe536a..ccb37b0776 100644 --- a/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb +++ b/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb @@ -25,7 +25,6 @@ IXP4XX_PATCHES += "file://15-jffs2-endian-config.patch;patch=1" IXP4XX_PATCHES += "${RPSRC}/led_core-r11.patch;patch=1" IXP4XX_PATCHES += "${RPSRC}/led_triggers-r9.patch;patch=1" IXP4XX_PATCHES += "${RPSRC}/led_trig_timer-r4.patch;patch=1" -# IXP4XX_PATCHES += "${RPSRC}/led_trig_sharpsl_pm-r4a.patch;patch=1 IXP4XX_PATCHES += "${RPSRC}/led_zaurus-r8.patch;patch=1" IXP4XX_PATCHES += "${RPSRC}/led_locomo-r5.patch;patch=1" IXP4XX_PATCHES += "${RPSRC}/led_ixp4xx-r0.patch;patch=1" @@ -40,7 +39,6 @@ IXP4XX_PATCHES += "file://48-setup-byteswap-cmdline.patch;patch=1" IXP4XX_PATCHES += "file://61-ixp4xx-beeper-irq.patch;patch=1" IXP4XX_PATCHES += "file://61-nslu2-beeper.patch;patch=1" IXP4XX_PATCHES += "file://65-loft-config.patch;patch=1" -IXP4XX_PATCHES += "file://80-nas100d-fix-i2c.patch;patch=1" IXP4XX_PATCHES += "file://81-nslu2-power.patch;patch=1" IXP4XX_PATCHES += "file://82-nas100d-power.patch;patch=1" IXP4XX_PATCHES += "file://85-timer.patch;patch=1" @@ -51,13 +49,7 @@ IXP4XX_PATCHES += "file://92-nslu2-maclist.patch;patch=1" # IXP4XX_PATCHES += "file://93-loft-maclist.patch;patch=1" IXP4XX_PATCHES += "file://94-nas100d-setup.patch;patch=1" IXP4XX_PATCHES += "file://94-nslu2-setup.patch;patch=1" -IXP4XX_PATCHES += "file://94-loft-setup.patch;patch=1" # 96-loft-leds is still required, but does not apply cleanly. # IXP4XX_PATCHES += "file://96-loft-leds.patch;patch=1" IXP4XX_PATCHES += "file://96-nas100d-leds.patch;patch=1" IXP4XX_PATCHES += "file://96-nslu2-leds.patch;patch=1" -IXP4XX_PATCHES += "file://97-ds101-includes.patch;patch=1" -IXP4XX_PATCHES += "file://97-ds101-misc.patch;patch=1" -IXP4XX_PATCHES += "file://97-ds101-pci.patch;patch=1" -IXP4XX_PATCHES += "file://97-ds101-power.patch;patch=1" -IXP4XX_PATCHES += "file://97-ds101-setup.patch;patch=1" -- cgit v1.2.3 From 6a2281b9991d0dd15aae5178eabd3a6d7090b6bc Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 11 Feb 2006 12:23:54 +0000 Subject: ixp4xx-kernel: Fixed i2c on nas100d (thanks to dwery) --- .../linux/ixp4xx-kernel/2.6.16/80-nas100d-fix-i2c.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 packages/linux/ixp4xx-kernel/2.6.16/80-nas100d-fix-i2c.patch diff --git a/packages/linux/ixp4xx-kernel/2.6.16/80-nas100d-fix-i2c.patch b/packages/linux/ixp4xx-kernel/2.6.16/80-nas100d-fix-i2c.patch new file mode 100644 index 0000000000..6610cc0872 --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.16/80-nas100d-fix-i2c.patch @@ -0,0 +1,16 @@ + include/asm-arm/arch-ixp4xx/nas100d.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- linux-nslu2.orig/include/asm-arm/arch-ixp4xx/nas100d.h 2006-02-06 20:37:38.000000000 +0100 ++++ linux-nslu2/include/asm-arm/arch-ixp4xx/nas100d.h 2006-02-09 14:33:49.000000000 +0100 +@@ -19,8 +19,8 @@ + #error "Do not include this directly, instead #include " + #endif + +-#define NAS100D_SDA_PIN 6 +-#define NAS100D_SCL_PIN 5 ++#define NAS100D_SDA_PIN 5 ++#define NAS100D_SCL_PIN 6 + + /* + * NAS100D PCI IRQs -- cgit v1.2.3 From cb2b68ec0dc5d23a110b8730dc45d7ddbdd19e9d Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 11 Feb 2006 12:24:31 +0000 Subject: ixp4xx-kernel: Fixed i2c on nas100d (thanks to dwery) --- packages/linux/ixp4xx-kernel_2.6.16-rc2.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb b/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb index ccb37b0776..5a81a23540 100644 --- a/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb +++ b/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb @@ -39,6 +39,7 @@ IXP4XX_PATCHES += "file://48-setup-byteswap-cmdline.patch;patch=1" IXP4XX_PATCHES += "file://61-ixp4xx-beeper-irq.patch;patch=1" IXP4XX_PATCHES += "file://61-nslu2-beeper.patch;patch=1" IXP4XX_PATCHES += "file://65-loft-config.patch;patch=1" +IXP4XX_PATCHES += "file://89-nas100d-fix-i2c.patch;patch=1" IXP4XX_PATCHES += "file://81-nslu2-power.patch;patch=1" IXP4XX_PATCHES += "file://82-nas100d-power.patch;patch=1" IXP4XX_PATCHES += "file://85-timer.patch;patch=1" -- cgit v1.2.3 From 08e120cf6d7b0053a539713a2315a1208cf3e530 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 11 Feb 2006 12:25:10 +0000 Subject: ixp4xx-kernel: Added 94-loft-setup --- packages/linux/ixp4xx-kernel_2.6.16-rc2.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb b/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb index 5a81a23540..5389022313 100644 --- a/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb +++ b/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb @@ -50,6 +50,7 @@ IXP4XX_PATCHES += "file://92-nslu2-maclist.patch;patch=1" # IXP4XX_PATCHES += "file://93-loft-maclist.patch;patch=1" IXP4XX_PATCHES += "file://94-nas100d-setup.patch;patch=1" IXP4XX_PATCHES += "file://94-nslu2-setup.patch;patch=1" +IXP4XX_PATCHES += "file://94-loft-setup.patch;patch=1" # 96-loft-leds is still required, but does not apply cleanly. # IXP4XX_PATCHES += "file://96-loft-leds.patch;patch=1" IXP4XX_PATCHES += "file://96-nas100d-leds.patch;patch=1" -- cgit v1.2.3 From a2ff7487f5c672bd06206e565024953949f49116 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 11 Feb 2006 12:33:35 +0000 Subject: ixp4xx-kernel: Added 94-loft-setup, fixed 94-nas100d-setup (dwery), added initial ds101 patchset (NAiL) --- .../linux/ixp4xx-kernel/2.6.16/94-loft-setup.patch | 154 +++++++++++ .../ixp4xx-kernel/2.6.16/94-nas100d-setup.patch | 11 +- .../ixp4xx-kernel/2.6.16/97-ds101-includes.patch | 102 ++++++++ .../linux/ixp4xx-kernel/2.6.16/97-ds101-misc.patch | 27 ++ .../linux/ixp4xx-kernel/2.6.16/97-ds101-pci.patch | 73 ++++++ .../ixp4xx-kernel/2.6.16/97-ds101-power.patch | 75 ++++++ .../ixp4xx-kernel/2.6.16/97-ds101-setup.patch | 288 +++++++++++++++++++++ packages/linux/ixp4xx-kernel/2.6.16/defconfig | 117 +++++---- packages/linux/ixp4xx-kernel_2.6.16-rc2.bb | 8 +- 9 files changed, 791 insertions(+), 64 deletions(-) create mode 100644 packages/linux/ixp4xx-kernel/2.6.16/94-loft-setup.patch create mode 100644 packages/linux/ixp4xx-kernel/2.6.16/97-ds101-includes.patch create mode 100644 packages/linux/ixp4xx-kernel/2.6.16/97-ds101-misc.patch create mode 100644 packages/linux/ixp4xx-kernel/2.6.16/97-ds101-pci.patch create mode 100644 packages/linux/ixp4xx-kernel/2.6.16/97-ds101-power.patch create mode 100644 packages/linux/ixp4xx-kernel/2.6.16/97-ds101-setup.patch diff --git a/packages/linux/ixp4xx-kernel/2.6.16/94-loft-setup.patch b/packages/linux/ixp4xx-kernel/2.6.16/94-loft-setup.patch new file mode 100644 index 0000000000..e84508b85b --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.16/94-loft-setup.patch @@ -0,0 +1,154 @@ + arch/arm/mach-ixp4xx/ixdp425-setup.c | 115 ++++++++++++++++++++++++++++++++++- + 1 file changed, 112 insertions(+), 3 deletions(-) + +--- linux-nslu2.orig/arch/arm/mach-ixp4xx/ixdp425-setup.c 2006-02-10 18:03:51.000000000 +0100 ++++ linux-nslu2/arch/arm/mach-ixp4xx/ixdp425-setup.c 2006-02-10 18:06:40.000000000 +0100 +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -25,6 +26,10 @@ + #include + #include + ++#ifdef CONFIG_MACLIST ++#include ++#endif ++ + static struct flash_platform_data ixdp425_flash_data = { + .map_name = "cfi_probe", + .width = 2, +@@ -176,17 +181,122 @@ MACHINE_START(AVILA, "Gateworks Avila Ne + MACHINE_END + #endif + ++#ifdef CONFIG_MACH_LOFT + /* + * Loft is functionally equivalent to Avila except that it has a + * different number for the maximum PCI devices. The MACHINE +- * structure below is identical to Avila except for the comment. ++ * structure below is derived from the Avila one (and may, in ++ * fact, be useful on Avila in general). ++ * ++ * The loft init registers a notifier on the on-board EEPROM to ++ * detect the MAC addresses. ++ * NOTE: this probably works for all Gateworks Avila boards and ++ * maybe the ixdp425 too. ++ * ++ * When the EEPROM is added the MAC address are read from it. + */ +-#ifdef CONFIG_MACH_LOFT ++ ++#if defined(CONFIG_SENSORS_EEPROM) && defined(CONFIG_MACLIST) ++static void loft_eeprom_add(int address, int kind, struct kobject *kobj, ++ struct bin_attribute *eeprom_attr) { ++ /* The MACs are the first 12 bytes in the eeprom at address 0x51 */ ++ if (address == 0x51) { ++ ssize_t retlen; ++ char data[12]; ++ ++ /* Two Macs, one at 0, the other at 6, maclist_add will ++ * complain if the ID is not a valid MAC. ++ */ ++ retlen = eeprom_attr->read(kobj, data, 0, sizeof data); ++ if (retlen >= 6) { ++ u8 mac[6]; ++ memcpy(mac, data+0, sizeof mac); ++ printk(KERN_INFO "LOFT MAC[0]: %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n", ++ mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); ++ maclist_add(mac); ++ } ++ if (retlen >= 12) { ++ u8 mac[6]; ++ memcpy(mac, data+6, sizeof mac); ++ printk(KERN_INFO "LOFT MAC[1]: %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n", ++ mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); ++ maclist_add(mac); ++ } ++ } ++} ++ ++static struct eeprom_notifier loft_eeprom_notifier = { ++ .add = loft_eeprom_add ++}; ++#endif ++ ++/* ++ * Loft bootstrap may pass in parameters, if these contain an ++ * ATAG_MEM and it appears valid (not the 16MByte one in the ++ * setup/kernel.c default) we use it, otherwise a 64MByte ++ * setting is forced here, this may be overridden on the ++ * command line. ++ */ ++static void __init loft_fixup(struct machine_desc *desc, ++ struct tag *tags, char **cmdline, struct meminfo *mi) ++{ ++ char saved_command_line[COMMAND_LINE_SIZE]; ++ ++ /* Put Loft specific known-required-for-certain stuff here, leave ++ * a trailing space! ++ */ ++ static char loft_command_line[] = ++ "root=/dev/mtdblock2 rw rootfstype=jffs2 init=/linuxrc " ++ "rtc-ds1672.probe=0,0x68 "; ++ const int len = (sizeof loft_command_line) - 1; ++ int memtag = 0; ++ ++ /* The EEPROM has two ethernet MACs embedded in it which we need, ++ * that is all this notifier does. ++ */ ++#ifdef CONFIG_SENSORS_EEPROM ++ register_eeprom_user(&loft_eeprom_notifier); ++#endif ++ ++ /* The Loft typically has one bank of 64MByte memory. ++ * NOTE: setting nr_banks != 0 causes kernel/setup.c to remove ++ * the mem tags from the tag list, so if there is an entry ++ * there don't remove it! ++ */ ++ if (tags->hdr.tag == ATAG_CORE) do { ++ tags = tag_next(tags); ++ printk(KERN_NOTICE "ATAG[0x%x] size %d\n", tags->hdr.tag, tags->hdr.size); ++ if (tags->hdr.tag == ATAG_MEM && tags->hdr.size == tag_size(tag_mem32) && ++ (tags->u.mem.start != 0 || tags->u.mem.size != (16*1024*1024))) { ++ memtag = 1; ++ printk(KERN_NOTICE " ATAG_MEM base %x, size %dMB\n", ++ tags->u.mem.start, ++ tags->u.mem.size / (1024*1024)); ++ } ++ } while (tags->hdr.size); ++ ++ if (!memtag) { ++ mi->nr_banks = 1; ++ mi->bank[0].start = 0; ++ mi->bank[0].size = (64*1024*1024); ++ mi->bank[0].node = PHYS_TO_NID(0); ++ } ++ ++ /* A command line in the ATAG list will override this one, ++ * as is intended. ++ */ ++ memcpy(saved_command_line, *cmdline, COMMAND_LINE_SIZE); ++ memcpy(*cmdline, loft_command_line, len); ++ memcpy(*cmdline + len, saved_command_line, COMMAND_LINE_SIZE - len); ++ *cmdline[COMMAND_LINE_SIZE-1] = 0; ++} ++ + MACHINE_START(LOFT, "Giant Shoulder Inc Loft board") + /* Maintainer: Tom Billman */ + .phys_ram = PHYS_OFFSET, + .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, + .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, ++ .fixup = loft_fixup, + .map_io = ixp4xx_map_io, + .init_irq = ixp4xx_init_irq, + .timer = &ixp4xx_timer, +@@ -194,4 +304,3 @@ MACHINE_START(LOFT, "Giant Shoulder Inc + .init_machine = ixdp425_init, + MACHINE_END + #endif +- diff --git a/packages/linux/ixp4xx-kernel/2.6.16/94-nas100d-setup.patch b/packages/linux/ixp4xx-kernel/2.6.16/94-nas100d-setup.patch index bc7bf2061a..b9c4c265d0 100644 --- a/packages/linux/ixp4xx-kernel/2.6.16/94-nas100d-setup.patch +++ b/packages/linux/ixp4xx-kernel/2.6.16/94-nas100d-setup.patch @@ -4,11 +4,11 @@ in the boot loader. Signed-off-by: John Bowler - arch/arm/mach-ixp4xx/nas100d-setup.c | 43 +++++++++++++++++++++++++++++++++++ - 1 file changed, 43 insertions(+) + arch/arm/mach-ixp4xx/nas100d-setup.c | 42 +++++++++++++++++++++++++++++++++++ + 1 file changed, 42 insertions(+) ---- linux-nslu2.orig/arch/arm/mach-ixp4xx/nas100d-setup.c 2006-02-06 22:35:26.000000000 +0100 -+++ linux-nslu2/arch/arm/mach-ixp4xx/nas100d-setup.c 2006-02-06 22:40:20.000000000 +0100 +--- linux-nslu2.orig/arch/arm/mach-ixp4xx/nas100d-setup.c 2006-02-09 13:24:19.000000000 +0100 ++++ linux-nslu2/arch/arm/mach-ixp4xx/nas100d-setup.c 2006-02-09 15:13:56.000000000 +0100 @@ -17,6 +17,8 @@ #include #include @@ -18,7 +18,7 @@ Signed-off-by: John Bowler #include #include #include -@@ -161,11 +163,52 @@ static void __init nas100d_init(void) +@@ -161,11 +163,51 @@ static void __init nas100d_init(void) platform_add_devices(nas100d_devices, ARRAY_SIZE(nas100d_devices)); } @@ -41,7 +41,6 @@ Signed-off-by: John Bowler + */ +static char nas100d_command_line[] __initdata = + "root=/dev/mtdblock2 rootfstype=jffs2 init=/linuxrc " -+ "pcf8563.hctosys=1 " + CONFIG_CMDLINE; + +static void __init nas100d_fixup(struct machine_desc *desc, diff --git a/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-includes.patch b/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-includes.patch new file mode 100644 index 0000000000..35357b2d77 --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-includes.patch @@ -0,0 +1,102 @@ +diff -ruN linux-2.6.15.orig/include/asm-arm/arch-ixp4xx/hardware.h linux-2.6.15.new/include/asm-arm/arch-ixp4xx/hardware.h +--- linux-2.6.15.orig/include/asm-arm/arch-ixp4xx/hardware.h 2006-02-11 02:58:47.000000000 +0100 ++++ linux-2.6.15.new/include/asm-arm/arch-ixp4xx/hardware.h 2006-02-10 22:26:54.000000000 +0100 +@@ -46,5 +46,6 @@ + #include "prpmc1100.h" + #include "nslu2.h" + #include "nas100d.h" ++#include "ds101.h" + + #endif /* _ASM_ARCH_HARDWARE_H */ +diff -ruN linux-2.6.15.orig/include/asm-arm/arch-ixp4xx/irqs.h linux-2.6.15.new/include/asm-arm/arch-ixp4xx/irqs.h +--- linux-2.6.15.orig/include/asm-arm/arch-ixp4xx/irqs.h 2006-02-11 02:58:47.000000000 +0100 ++++ linux-2.6.15.new/include/asm-arm/arch-ixp4xx/irqs.h 2006-02-10 22:56:11.000000000 +0100 +@@ -108,5 +108,12 @@ + #define IRQ_NAS100D_PCI_INTC IRQ_IXP4XX_GPIO9 + #define IRQ_NAS100D_PCI_INTD IRQ_IXP4XX_GPIO8 + #define IRQ_NAS100D_PCI_INTE IRQ_IXP4XX_GPIO7 ++/* ++ * DS101 board IRQs ++ */ ++ ++#define IRQ_DS101_PCI_INTA IRQ_IXP4XX_GPIO11 ++#define IRQ_DS101_PCI_INTB IRQ_IXP4XX_GPIO10 ++#define IRQ_DS101_PCI_INTC IRQ_IXP4XX_GPIO9 + + #endif +diff -ruN linux-2.6.15.orig/include/asm-arm/arch/ds101.h linux-2.6.15.new/include/asm-arm/arch/ds101.h +--- linux-2.6.15.orig/include/asm-arm/arch/ds101.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.15.new/include/asm-arm/arch/ds101.h 2006-02-10 22:16:24.000000000 +0100 +@@ -0,0 +1,72 @@ ++/* ++ * include/asm-arm/arch-ixp4xx/ds101.h ++ * ++ * DS101 platform specific definitions ++ * ++ * Copyright (c) 2005 Tower Technologies ++ * ++ * Author: Alessandro Zummo ++ * ++ * based on ixdp425.h: ++ * Copyright 2004 (c) MontaVista, Software, Inc. ++ * ++ * This file is licensed under the terms of the GNU General Public ++ * License version 2. This program is licensed "as is" without any ++ * warranty of any kind, whether express or implied. ++ */ ++ ++#ifndef __ASM_ARCH_HARDWARE_H__ ++#error "Do not include this directly, instead #include " ++#endif ++ ++#define DS101_SDA_PIN 1 ++#define DS101_SCL_PIN 0 ++ ++/* ++ * DS101 PCI IRQs ++ */ ++#define DS101_PCI_MAX_DEV 3 ++#define DS101_PCI_IRQ_LINES 3 ++ ++ ++/* PCI controller GPIO to IRQ pin mappings */ ++#define DS101_PCI_INTA_PIN 11 ++#define DS101_PCI_INTB_PIN 10 ++#define DS101_PCI_INTC_PIN 9 ++// #define DS101_PCI_INTD_PIN 8 ++// #define DS101_PCI_INTE_PIN 7 ++ ++/* GPIO */ ++ ++#define DS101_GPIO0 0 ++#define DS101_GPIO1 1 ++#define DS101_GPIO2 2 ++#define DS101_GPIO3 3 ++#define DS101_GPIO4 4 ++#define DS101_GPIO5 5 ++#define DS101_GPIO6 6 ++#define DS101_GPIO7 7 ++#define DS101_GPIO8 8 ++#define DS101_GPIO9 9 ++#define DS101_GPIO10 10 ++#define DS101_GPIO11 11 ++#define DS101_GPIO12 12 ++#define DS101_GPIO13 13 ++#define DS101_GPIO14 14 ++#define DS101_GPIO15 15 ++ ++ ++/* Buttons */ ++ ++#define DS101_PB_GPIO DS101_GPIO8 ++#define DS101_RB_GPIO DS101_GPIO12 ++#define DS101_PO_GPIO DS101_GPIO7 /* power off */ ++ ++#define DS101_PB_IRQ IRQ_IXP4XX_GPIO8 ++#define DS101_RB_IRQ IRQ_IXP4XX_GPIO12 ++ ++/* ++#define DS101_PB_BM (1L << DS101_PB_GPIO) ++#define DS101_PO_BM (1L << DS101_PO_GPIO) ++#define DS101_RB_BM (1L << DS101_RB_GPIO) ++*/ diff --git a/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-misc.patch b/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-misc.patch new file mode 100644 index 0000000000..ea5f91b45f --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-misc.patch @@ -0,0 +1,27 @@ +diff -ruN linux-2.6.15.orig/arch/arm/mach-ixp4xx/Makefile linux-2.6.15.new/arch/arm/mach-ixp4xx/Makefile +--- linux-2.6.15.orig/arch/arm/mach-ixp4xx/Makefile 2006-02-11 02:57:58.000000000 +0100 ++++ linux-2.6.15.new/arch/arm/mach-ixp4xx/Makefile 2006-02-10 22:13:27.000000000 +0100 +@@ -10,4 +10,4 @@ + obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-pci.o gtwx5715-setup.o + obj-$(CONFIG_MACH_NSLU2) += nslu2-pci.o nslu2-setup.o nslu2-power.o + obj-$(CONFIG_MACH_NAS100D) += nas100d-pci.o nas100d-setup.o nas100d-power.o +- ++obj-$(CONFIG_MACH_DS101) += ds101-pci.o ds101-setup.o ds101-power.o +diff -ruN linux-2.6.15.orig/arch/arm/mach-ixp4xx/Kconfig linux-2.6.15.new/arch/arm/mach-ixp4xx/Kconfig +--- linux-2.6.15.orig/arch/arm/mach-ixp4xx/Kconfig 2006-02-11 03:00:07.000000000 +0100 ++++ linux-2.6.15.new/arch/arm/mach-ixp4xx/Kconfig 2006-02-10 22:21:09.000000000 +0100 +@@ -86,6 +86,14 @@ + NAS 100d device. For more information on this platform, + see http://www.nslu2-linux.org/wiki/NAS100d/HomePage + ++config MACH_DS101 ++ bool ++ prompt "DS101" ++ help ++ Say 'Y' here if you want your kernel to support Synology's ++ DiskStation DS101(j) device. For more information on this ++ platform see http://www.nslu2-linux.org/wiki/DS101/HomePage ++ + # + # Avila and IXDP share the same source for now. Will change in future + # diff --git a/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-pci.patch b/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-pci.patch new file mode 100644 index 0000000000..8940bd63a6 --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-pci.patch @@ -0,0 +1,73 @@ +diff -ruN linux-2.6.15.orig/arch/arm/mach-ixp4xx/ds101-pci.c linux-2.6.15.new/arch/arm/mach-ixp4xx/ds101-pci.c +--- linux-2.6.15.orig/arch/arm/mach-ixp4xx/ds101-pci.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.15.new/arch/arm/mach-ixp4xx/ds101-pci.c 2006-02-10 22:31:00.000000000 +0100 +@@ -0,0 +1,69 @@ ++/* ++ * arch/arm/mach-ixp4xx/ds101-pci.c ++ * ++ * DS101 board-level PCI initialization ++ * ++ * based on ixdp425-pci.c: ++ * Copyright (C) 2002 Intel Corporation. ++ * Copyright (C) 2003-2004 MontaVista Software, Inc. ++ * ++ * Maintainer: http://www.nslu2-linux.org/ ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ * ++ */ ++ ++#include ++#include ++#include ++ ++#include ++#include ++ ++void __init ds101_pci_preinit(void) ++{ ++ set_irq_type(IRQ_DS101_PCI_INTA, IRQT_LOW); ++ set_irq_type(IRQ_DS101_PCI_INTB, IRQT_LOW); ++ set_irq_type(IRQ_DS101_PCI_INTC, IRQT_LOW); ++ ++ ixp4xx_pci_preinit(); ++} ++ ++static int __init ds101_map_irq(struct pci_dev *dev, u8 slot, u8 pin) ++{ ++ static int pci_irq_table[DS101_PCI_MAX_DEV][DS101_PCI_IRQ_LINES] = ++ { ++ { IRQ_DS101_PCI_INTA, -1, -1 }, ++ { IRQ_DS101_PCI_INTB, -1, -1 }, ++ { IRQ_DS101_PCI_INTC, -1, -1 }, ++ }; ++ ++ int irq = -1; ++ ++ if (slot >= 1 && slot <= DS101_PCI_MAX_DEV && ++ pin >= 1 && pin <= DS101_PCI_IRQ_LINES) ++ irq = pci_irq_table[slot-1][pin-1]; ++ ++ return irq; ++} ++ ++struct hw_pci __initdata ds101_pci = { ++ .nr_controllers = 1, ++ .preinit = ds101_pci_preinit, ++ .swizzle = pci_std_swizzle, ++ .setup = ixp4xx_setup, ++ .scan = ixp4xx_scan_bus, ++ .map_irq = ds101_map_irq, ++}; ++ ++int __init ds101_pci_init(void) ++{ ++ if (machine_is_ds101()) ++ pci_common_init(&ds101_pci); ++ ++ return 0; ++} ++ ++subsys_initcall(ds101_pci_init); diff --git a/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-power.patch b/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-power.patch new file mode 100644 index 0000000000..3c309f3536 --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-power.patch @@ -0,0 +1,75 @@ +diff -ruN linux-2.6.15.orig/arch/arm/mach-ixp4xx/ds101-power.c linux-2.6.15.new/arch/arm/mach-ixp4xx/ds101-power.c +--- linux-2.6.15.orig/arch/arm/mach-ixp4xx/ds101-power.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.15.new/arch/arm/mach-ixp4xx/ds101-power.c 2006-02-10 23:54:40.000000000 +0100 +@@ -0,0 +1,71 @@ ++/* ++ * arch/arm/mach-ixp4xx/ds101-power.c ++ * ++ * DS101 Power/Reset driver ++ * ++ * Copyright (C) 2005 Tower Technologies ++ * ++ * based on ds101-io.c ++ * Copyright (C) 2004 Karen Spearel ++ * ++ * Author: Alessandro Zummo ++ * Author: OEyvind Repvik ++ * Maintainers: http://www.nslu2-linux.org/ ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ * ++ */ ++ ++#include ++#include ++#include ++ ++#include ++ ++extern void ctrl_alt_del(void); ++ ++static irqreturn_t ds101_reset_handler(int irq, void *dev_id, struct pt_regs *regs) ++{ ++ /* Signal init to do the ctrlaltdel action, this will bypass init if ++ * it hasn't started and do a kernel_restart. ++ */ ++ ctrl_alt_del(); ++ ++ return IRQ_HANDLED; ++} ++ ++static int __init ds101_power_init(void) ++{ ++ if (!(machine_is_ds101())) ++ return 0; ++ ++ set_irq_type(DS101_RB_IRQ, IRQT_LOW); ++ ++ if (request_irq(DS101_RB_IRQ, &ds101_reset_handler, ++ SA_INTERRUPT, "DS101 reset button", NULL) < 0) { ++ ++ printk(KERN_DEBUG "Reset Button IRQ %d not available\n", ++ DS101_RB_IRQ); ++ ++ return -EIO; ++ } ++ ++ return 0; ++} ++ ++static void __exit ds101_power_exit(void) ++{ ++ if (!(machine_is_ds101())) ++ return; ++ ++ free_irq(DS101_RB_IRQ, NULL); ++} ++ ++module_init(ds101_power_init); ++module_exit(ds101_power_exit); ++ ++MODULE_AUTHOR("Alessandro Zummo "); ++MODULE_DESCRIPTION("DS101 Power/Reset driver"); ++MODULE_LICENSE("GPL"); diff --git a/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-setup.patch b/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-setup.patch new file mode 100644 index 0000000000..ac3f7d19c7 --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-setup.patch @@ -0,0 +1,288 @@ +diff -ruN linux-2.6.15.orig/arch/arm/mach-ixp4xx/ds101-setup.c linux-2.6.15.new/arch/arm/mach-ixp4xx/ds101-setup.c +--- linux-2.6.15.orig/arch/arm/mach-ixp4xx/ds101-setup.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.15.new/arch/arm/mach-ixp4xx/ds101-setup.c 2006-02-11 02:17:35.000000000 +0100 +@@ -0,0 +1,284 @@ ++/* ++ * arch/arm/mach-ixp4xx/ds101-setup.c ++ * ++ * DS 101 board-setup ++ * ++ * based ixdp425-setup.c: ++ * Copyright (C) 2003-2004 MontaVista Software, Inc. ++ * ++ * Author: Alessandro Zummo ++ * Author: Rod Whitby ++ * Author: OEyvind Repvik ++ * Maintainers: http://www.nslu2-linux.org/ ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++ ++static struct flash_platform_data ds101_flash_data = { ++ .map_name = "cfi_probe", ++ .width = 2, ++}; ++ ++static struct resource ds101_flash_resource = { ++ .flags = IORESOURCE_MEM, ++}; ++ ++static struct platform_device ds101_flash = { ++ .name = "IXP4XX-Flash", ++ .id = 0, ++ .dev.platform_data = &ds101_flash_data, ++ .num_resources = 1, ++ .resource = &ds101_flash_resource, ++}; ++ ++#ifdef CONFIG_LEDS_CLASS ++static struct resource ds101_led_resources[] = { ++ { ++ .name = "power", /* blue power led */ ++ .start = 3, ++ .end = 3, ++ .flags = IXP4XX_GPIO_LOW, ++ }, ++ { ++ .name = "status-1", ++ .start = 14, ++ .end = 14, ++ .flags = IXP4XX_GPIO_LOW, ++ }, ++ { ++ .name = "status-2", ++ .start = 15, ++ .end = 15, ++ .flags = IXP4XX_GPIO_LOW, ++ }, ++ { ++ .name = "usb-1", /* The usb-copy-button led */ ++ .start = 5, ++ .end = 5, ++ .flags = IXP4XX_GPIO_LOW, ++ }, ++ { ++ .name = "usb-2", /* also the usb-copy-button led */ ++ .start = 4, ++ .end = 4, ++ .flags = IXP4XX_GPIO_LOW, ++ }, ++ { ++ .name = "test", ++ .start = 6, ++ .end = 6, ++ .flags = IXP4XX_GPIO_LOW, ++ }, ++}; ++ ++ ++static struct platform_device ds101_leds = { ++ .name = "IXP4XX-GPIO-LED", ++ .id = -1, ++ .num_resources = ARRAY_SIZE(ds101_led_resources), ++ .resource = ds101_led_resources, ++}; ++#endif ++ ++static struct ixp4xx_i2c_pins ds101_i2c_gpio_pins = { ++ .sda_pin = DS101_SDA_PIN, ++ .scl_pin = DS101_SCL_PIN, ++}; ++ ++static struct platform_device ds101_i2c_controller = { ++ .name = "IXP4XX-I2C", ++ .id = 0, ++ .dev.platform_data = &ds101_i2c_gpio_pins, ++ .num_resources = 0, ++}; ++ ++static struct platform_device ds101_beeper = { ++ .name = "ixp4xx-beeper", ++ .id = 2, ++ .num_resources = 0, ++}; ++ ++static struct resource ds101_uart_resources[] = { ++ { ++ .start = IXP4XX_UART1_BASE_PHYS, ++ .end = IXP4XX_UART1_BASE_PHYS + 0x0fff, ++ .flags = IORESOURCE_MEM, ++ }, ++ { ++ .start = IXP4XX_UART2_BASE_PHYS, ++ .end = IXP4XX_UART2_BASE_PHYS + 0x0fff, ++ .flags = IORESOURCE_MEM, ++ } ++}; ++ ++static struct plat_serial8250_port ds101_uart_data[] = { ++ { ++ .mapbase = IXP4XX_UART1_BASE_PHYS, ++ .membase = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET, ++ .irq = IRQ_IXP4XX_UART1, ++ .flags = UPF_BOOT_AUTOCONF, ++ .iotype = UPIO_MEM, ++ .regshift = 2, ++ .uartclk = IXP4XX_UART_XTAL, ++ }, ++ { ++ .mapbase = IXP4XX_UART2_BASE_PHYS, ++ .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, ++ .irq = IRQ_IXP4XX_UART2, ++ .flags = UPF_BOOT_AUTOCONF, ++ .iotype = UPIO_MEM, ++ .regshift = 2, ++ .uartclk = IXP4XX_UART_XTAL, ++ }, ++ { } ++}; ++ ++static struct platform_device ds101_uart = { ++ .name = "serial8250", ++ .id = PLAT8250_DEV_PLATFORM, ++ .dev.platform_data = ds101_uart_data, ++ .num_resources = 2, ++ .resource = ds101_uart_resources, ++}; ++ ++static struct platform_device *ds101_devices[] __initdata = { ++ &ds101_i2c_controller, ++ &ds101_flash, ++ &ds101_beeper, ++}; ++ ++static void ds101_power_off(void) ++{ ++ /* This causes the box to drop the power and go dead. */ ++ ++ /* enable the pwr cntl gpio */ ++ gpio_line_config(DS101_PO_GPIO, IXP4XX_GPIO_OUT); ++ ++ /* do the deed */ ++ gpio_line_set(DS101_PO_GPIO, IXP4XX_GPIO_HIGH); ++} ++ ++/* ++ * When the RedBoot config partition is added the MAC address is read from ++ * it. ++ * FIXME: This isn't correct on the DS101! ++ */ ++static void ds101_flash_add(struct mtd_info *mtd) { ++ if (strcmp(mtd->name, "RedBoot config") == 0) { ++ size_t retlen; ++ u_char mac[6]; ++ ++ /* The MAC is at a known offset... */ ++ if (mtd->read(mtd, 0x0FD8, 6, &retlen, mac) == 0 && retlen == 6) { ++ printk(KERN_INFO "DS101 MAC: %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n", ++ mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); ++ maclist_add(mac); ++ } else { ++ printk(KERN_ERR "DS101 MAC: read failed\n"); ++ } ++ } ++} ++ ++/* ++ * Nothing to do on remove at present. ++ */ ++static void ds101_flash_remove(struct mtd_info *mtd) { ++} ++ ++static struct mtd_notifier ds101_flash_notifier = { ++ .add = ds101_flash_add, ++ .remove = ds101_flash_remove, ++}; ++ ++static void __init ds101_init(void) ++{ ++ /* The flash has an ethernet MAC embedded in it which we need, ++ * that is all this notifier does. ++ */ ++ register_mtd_user(&ds101_flash_notifier); ++ ++ ixp4xx_sys_init(); ++ ++ ds101_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); ++ ds101_flash_resource.end = ++ IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1; ++ ++ pm_power_off = ds101_power_off; ++ ++ /* This is only useful on a modified machine, but it is valuable ++ * to have it first in order to see debug messages, and so that ++ * it does *not* get removed if platform_add_devices fails! ++ */ ++ (void)platform_device_register(&ds101_uart); ++ ++ platform_add_devices(ds101_devices, ARRAY_SIZE(ds101_devices)); ++ ++#ifdef CONFIG_LEDS_CLASS ++ /* We don't care whether or not this works. */ ++ (void)platform_device_register(&ds101_leds); ++#endif ++} ++ ++/* ++ * DS101 bootstrap may pass in parameters, but we zap the mem ++ * settings to be safe (the box always has 64MByte at 0). The ++ * passed in command line can override this default, we prepend ++ * to the config'ed default. ++ * ++ * NOTE: the startup sequence is: ++ * 1) Call the machine fixup ++ * 2) Parse the ATAG list, the ATAG_CMDLINE is copied in ++ * to default_command_line which is the value of *from ++ * 3) Parse the command line in *from (*not* ++ * default_command_line unless they are the same!) ++ * ++ * Setting mi->nr_banks causes (2) to 'squash' (set to ATAG_NONE) ++ * any ATAG_MEM tags, but mem= command line options cause nr_banks ++ * to be reset to 0 (on the first mem=) ++ */ ++static char ds101_command_line[] __initdata = ++ "root=/dev/sda1 rootfstype=ext3 init=/sbin/init " ++ CONFIG_CMDLINE; ++ ++static void __init ds101_fixup(struct machine_desc *desc, ++ struct tag *tags, char **cmdline, struct meminfo *mi) ++{ ++ /* The DS101 has one bank of 64MByte memory. ++ * NOTE: setting nr_banks != 0 causes kernel/setup.c to remove ++ * the mem tags from the tag list. We need do nothing here! ++ */ ++ mi->nr_banks=1; ++ mi->bank[0].start = 0; ++ mi->bank[0].size = (64*1024*1024); ++ mi->bank[0].node = PHYS_TO_NID(0); ++ ++ /* A command line in the ATAG list will override this one, ++ * as is intended. ++ */ ++ strlcpy(*cmdline, ds101_command_line, COMMAND_LINE_SIZE); ++} ++ ++MACHINE_START(DS101, "Synology DiskStation DS101") ++ /* Maintainer: www.nslu2-linux.org */ ++ .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, ++ .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xFFFC, ++ .boot_params = 0x00000100, ++ .fixup = ds101_fixup, ++ .map_io = ixp4xx_map_io, ++ .init_irq = ixp4xx_init_irq, ++ .timer = &ixp4xx_timer, ++ .init_machine = ds101_init, ++MACHINE_END diff --git a/packages/linux/ixp4xx-kernel/2.6.16/defconfig b/packages/linux/ixp4xx-kernel/2.6.16/defconfig index 25c2ba40c2..e7973518c7 100644 --- a/packages/linux/ixp4xx-kernel/2.6.16/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.16/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16-rc2 -# Thu Feb 9 20:54:57 2006 +# Thu Feb 9 23:00:47 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -124,6 +124,7 @@ CONFIG_ARCH_IXDP425=y CONFIG_ARCH_IXCDP1100=y # CONFIG_ARCH_PRPMC1100 is not set CONFIG_MACH_NAS100D=y +CONFIG_MACH_DS101=y CONFIG_ARCH_IXDP4XX=y # CONFIG_MACH_GTWX5715 is not set @@ -583,60 +584,7 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8 # # ATA/ATAPI/MFM/RLL support # -CONFIG_IDE=y -CONFIG_BLK_DEV_IDE=y - -# -# Please see Documentation/ide.txt for help/info on IDE drives -# -# CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_BLK_DEV_IDEDISK=y -# CONFIG_IDEDISK_MULTI_MODE is not set -# CONFIG_BLK_DEV_IDECD is not set -# CONFIG_BLK_DEV_IDETAPE is not set -# CONFIG_BLK_DEV_IDEFLOPPY is not set -# CONFIG_BLK_DEV_IDESCSI is not set -# CONFIG_IDE_TASK_IOCTL is not set - -# -# IDE chipset support/bugfixes -# -CONFIG_IDE_GENERIC=y -CONFIG_BLK_DEV_IDEPCI=y -# CONFIG_IDEPCI_SHARE_IRQ is not set -# CONFIG_BLK_DEV_OFFBOARD is not set -# CONFIG_BLK_DEV_GENERIC is not set -# CONFIG_BLK_DEV_OPTI621 is not set -# CONFIG_BLK_DEV_SL82C105 is not set -CONFIG_BLK_DEV_IDEDMA_PCI=y -# CONFIG_BLK_DEV_IDEDMA_FORCED is not set -# CONFIG_IDEDMA_PCI_AUTO is not set -CONFIG_BLK_DEV_AEC62XX=y -# CONFIG_BLK_DEV_ALI15X3 is not set -# CONFIG_BLK_DEV_AMD74XX is not set -# CONFIG_BLK_DEV_CMD64X is not set -# CONFIG_BLK_DEV_TRIFLEX is not set -# CONFIG_BLK_DEV_CY82C693 is not set -# CONFIG_BLK_DEV_CS5520 is not set -# CONFIG_BLK_DEV_CS5530 is not set -# CONFIG_BLK_DEV_HPT34X is not set -# CONFIG_BLK_DEV_HPT366 is not set -# CONFIG_BLK_DEV_SC1200 is not set -# CONFIG_BLK_DEV_PIIX is not set -# CONFIG_BLK_DEV_IT821X is not set -# CONFIG_BLK_DEV_NS87415 is not set -# CONFIG_BLK_DEV_PDC202XX_OLD is not set -# CONFIG_BLK_DEV_PDC202XX_NEW is not set -# CONFIG_BLK_DEV_SVWKS is not set -# CONFIG_BLK_DEV_SIIMAGE is not set -# CONFIG_BLK_DEV_SLC90E66 is not set -# CONFIG_BLK_DEV_TRM290 is not set -# CONFIG_BLK_DEV_VIA82CXXX is not set -# CONFIG_IDE_ARM is not set -CONFIG_BLK_DEV_IDEDMA=y -# CONFIG_IDEDMA_IVB is not set -# CONFIG_IDEDMA_AUTO is not set -# CONFIG_BLK_DEV_HD is not set +# CONFIG_IDE is not set # # SCSI device support @@ -686,7 +634,53 @@ CONFIG_SCSI_MULTI_LUN=y # CONFIG_MEGARAID_NEWGEN is not set # CONFIG_MEGARAID_LEGACY is not set # CONFIG_MEGARAID_SAS is not set -# CONFIG_SCSI_SATA is not set +CONFIG_SCSI_SATA=y +# CONFIG_SCSI_SATA_AHCI is not set +# CONFIG_SCSI_SATA_SVW is not set +# CONFIG_SCSI_ATA_PIIX is not set +# CONFIG_SCSI_SATA_MV is not set +# CONFIG_SCSI_SATA_NV is not set +# CONFIG_SCSI_PDC_ADMA is not set +# CONFIG_SCSI_SATA_QSTOR is not set +# CONFIG_SCSI_SATA_PROMISE is not set +# CONFIG_SCSI_SATA_SX4 is not set +# CONFIG_SCSI_SATA_SIL is not set +# CONFIG_SCSI_SATA_SIL24 is not set +# CONFIG_SCSI_SATA_SIS is not set +# CONFIG_SCSI_SATA_ULI is not set +# CONFIG_SCSI_SATA_VIA is not set +# CONFIG_SCSI_SATA_VITESSE is not set +# CONFIG_SCSI_PATA_ALI is not set +# CONFIG_SCSI_PATA_AMD is not set +CONFIG_SCSI_PATA_ARTOP=y +# CONFIG_SCSI_PATA_ATIIXP is not set +# CONFIG_SCSI_PATA_CMD64X is not set +# CONFIG_SCSI_PATA_CS5520 is not set +# CONFIG_SCSI_PATA_CS5530 is not set +# CONFIG_SCSI_PATA_CYPRESS is not set +# CONFIG_SCSI_PATA_EFAR is not set +# CONFIG_SCSI_ATA_GENERIC is not set +# CONFIG_SCSI_PATA_HPT37X is not set +# CONFIG_SCSI_PATA_HPT3X2N is not set +# CONFIG_SCSI_PATA_HPT3X3 is not set +# CONFIG_SCSI_PATA_ISAPNP is not set +# CONFIG_SCSI_PATA_IT8172 is not set +# CONFIG_SCSI_PATA_IT821X is not set +# CONFIG_SCSI_PATA_LEGACY is not set +# CONFIG_SCSI_PATA_MPIIX is not set +# CONFIG_SCSI_PATA_NETCELL is not set +# CONFIG_SCSI_PATA_OLDPIIX is not set +# CONFIG_SCSI_PATA_OPTI is not set +# CONFIG_SCSI_PATA_PCMCIA is not set +# CONFIG_SCSI_PATA_QDI is not set +# CONFIG_SCSI_PATA_RZ1000 is not set +# CONFIG_SCSI_PATA_SC1200 is not set +# CONFIG_SCSI_PATA_SERVERWORKS is not set +# CONFIG_SCSI_PATA_SIL680 is not set +# CONFIG_SCSI_PATA_SIS is not set +# CONFIG_SCSI_PATA_TRIFLEX is not set +# CONFIG_SCSI_PATA_VIA is not set +# CONFIG_SCSI_PATA_WINBOND is not set # CONFIG_SCSI_DMX3191D is not set # CONFIG_SCSI_FUTURE_DOMAIN is not set # CONFIG_SCSI_IPS is not set @@ -1093,6 +1087,16 @@ CONFIG_HWMON=y # Multimedia Capabilities Port drivers # +# +# LED devices +# +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_IXP4XX=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_CPU_ACTIVITY=y + # # Multimedia devices # @@ -1294,7 +1298,6 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_DEBUG is not set # CONFIG_USB_STORAGE_DATAFAB is not set # CONFIG_USB_STORAGE_FREECOM is not set -# CONFIG_USB_STORAGE_ISD200 is not set # CONFIG_USB_STORAGE_DPCM is not set # CONFIG_USB_STORAGE_USBAT is not set # CONFIG_USB_STORAGE_SDDR09 is not set diff --git a/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb b/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb index 5389022313..644268637b 100644 --- a/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb +++ b/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb @@ -25,6 +25,7 @@ IXP4XX_PATCHES += "file://15-jffs2-endian-config.patch;patch=1" IXP4XX_PATCHES += "${RPSRC}/led_core-r11.patch;patch=1" IXP4XX_PATCHES += "${RPSRC}/led_triggers-r9.patch;patch=1" IXP4XX_PATCHES += "${RPSRC}/led_trig_timer-r4.patch;patch=1" +# IXP4XX_PATCHES += "${RPSRC}/led_trig_sharpsl_pm-r4a.patch;patch=1" IXP4XX_PATCHES += "${RPSRC}/led_zaurus-r8.patch;patch=1" IXP4XX_PATCHES += "${RPSRC}/led_locomo-r5.patch;patch=1" IXP4XX_PATCHES += "${RPSRC}/led_ixp4xx-r0.patch;patch=1" @@ -39,7 +40,7 @@ IXP4XX_PATCHES += "file://48-setup-byteswap-cmdline.patch;patch=1" IXP4XX_PATCHES += "file://61-ixp4xx-beeper-irq.patch;patch=1" IXP4XX_PATCHES += "file://61-nslu2-beeper.patch;patch=1" IXP4XX_PATCHES += "file://65-loft-config.patch;patch=1" -IXP4XX_PATCHES += "file://89-nas100d-fix-i2c.patch;patch=1" +IXP4XX_PATCHES += "file://80-nas100d-fix-i2c.patch;patch=1" IXP4XX_PATCHES += "file://81-nslu2-power.patch;patch=1" IXP4XX_PATCHES += "file://82-nas100d-power.patch;patch=1" IXP4XX_PATCHES += "file://85-timer.patch;patch=1" @@ -55,3 +56,8 @@ IXP4XX_PATCHES += "file://94-loft-setup.patch;patch=1" # IXP4XX_PATCHES += "file://96-loft-leds.patch;patch=1" IXP4XX_PATCHES += "file://96-nas100d-leds.patch;patch=1" IXP4XX_PATCHES += "file://96-nslu2-leds.patch;patch=1" +IXP4XX_PATCHES += "file://97-ds101-includes.patch;patch=1" +IXP4XX_PATCHES += "file://97-ds101-misc.patch;patch=1" +IXP4XX_PATCHES += "file://97-ds101-pci.patch;patch=1" +IXP4XX_PATCHES += "file://97-ds101-power.patch;patch=1" +IXP4XX_PATCHES += "file://97-ds101-setup.patch;patch=1" -- cgit v1.2.3 From 97bcf248d20216aa57280b8e2b37a1e20f48c3e9 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 11 Feb 2006 12:35:11 +0000 Subject: ixp4xx-kernel: Added support for building ds101 kernels. --- packages/linux/ixp4xx-kernel.inc | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc index 29b32e80d8..2ddb7cbb61 100644 --- a/packages/linux/ixp4xx-kernel.inc +++ b/packages/linux/ixp4xx-kernel.inc @@ -255,6 +255,20 @@ pkg_postrm_kernel-image-nslu2 () { update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${ARCH_BYTE_SEX}-${KERNEL_RELEASE} || true } +# The correct settings for the DS101 board: +ds101_MACHID = "833" +PACKAGES += "kernel-image-ds101" +PKG_kernel-image-ds101 = "kernel-image-${KERNEL_VERSION}" +PACKAGE_ARCH_kernel-image-ds101 = "ds101${ARCH_BYTE_SEX}" +DESCRIPTION_kernel-image-ds101 = "Linux kernel for the Synology DS101" +FILES_kernel-image-ds101 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-ds101${ARCH_BYTE_SEX}-${KERNEL_RELEASE}" +pkg_postinst_kernel-image-ds101 () { + update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-ds101${ARCH_BYTE_SEX}-${KERNEL_RELEASE} ${KERNEL_PRIORITY} || true +} +pkg_postrm_kernel-image-ds101 () { + update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-ds101${ARCH_BYTE_SEX}-${KERNEL_RELEASE} || true +} + # The correct settings for Loft: loft_MACHID = "849" PACKAGES += "kernel-image-loft" @@ -328,6 +342,7 @@ do_install_append() { # Add the machine specific images, with appropriate suffixes install_image 'nslu2${ARCH_BYTE_SEX}' '${nslu2_MACHID}' + install_image 'ds101${ARCH_BYTE_SEX}' '${ds101_MACHID}' install_image 'loft${ARCH_BYTE_SEX}' '${loft_MACHID}' install_image 'nas100d${ARCH_BYTE_SEX}' '${nas100d_MACHID}' } @@ -344,6 +359,7 @@ do_deploy() { # And the machine specific images deploy_image 'nslu2${ARCH_BYTE_SEX}' '${nslu2_MACHID}' + deploy_image 'ds101${ARCH_BYTE_SEX}' '${ds101_MACHID}' deploy_image 'loft${ARCH_BYTE_SEX}' '${loft_MACHID}' deploy_image 'nas100d${ARCH_BYTE_SEX}' '${nas100d_MACHID}' } -- cgit v1.2.3 From b9323d35105de198ca32180e4f202f66ae502db3 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 11 Feb 2006 12:40:36 +0000 Subject: ixp4xx-kernel: Fixed path in 97-ds101-includes.patch --- packages/linux/ixp4xx-kernel/2.6.16/97-ds101-includes.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-includes.patch b/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-includes.patch index 35357b2d77..d9a5f07494 100644 --- a/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-includes.patch +++ b/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-includes.patch @@ -25,8 +25,8 @@ diff -ruN linux-2.6.15.orig/include/asm-arm/arch-ixp4xx/irqs.h linux-2.6.15.new/ #endif diff -ruN linux-2.6.15.orig/include/asm-arm/arch/ds101.h linux-2.6.15.new/include/asm-arm/arch/ds101.h ---- linux-2.6.15.orig/include/asm-arm/arch/ds101.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.15.new/include/asm-arm/arch/ds101.h 2006-02-10 22:16:24.000000000 +0100 +--- linux-2.6.15.orig/include/asm-arm/arch-ixp4xx/ds101.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.15.new/include/asm-arm/arch-ixp4xx/ds101.h 2006-02-10 22:16:24.000000000 +0100 @@ -0,0 +1,72 @@ +/* + * include/asm-arm/arch-ixp4xx/ds101.h -- cgit v1.2.3 From 0553097d11c96e79b29cef6b8b21b34919fd1332 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 11 Feb 2006 13:22:54 +0000 Subject: ixp4xx-kernel: Updated 94-nas100d-setup.patch from dwery --- packages/linux/ixp4xx-kernel/2.6.16/94-nas100d-setup.patch | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/linux/ixp4xx-kernel/2.6.16/94-nas100d-setup.patch b/packages/linux/ixp4xx-kernel/2.6.16/94-nas100d-setup.patch index b9c4c265d0..cdca7d2766 100644 --- a/packages/linux/ixp4xx-kernel/2.6.16/94-nas100d-setup.patch +++ b/packages/linux/ixp4xx-kernel/2.6.16/94-nas100d-setup.patch @@ -4,11 +4,11 @@ in the boot loader. Signed-off-by: John Bowler - arch/arm/mach-ixp4xx/nas100d-setup.c | 42 +++++++++++++++++++++++++++++++++++ - 1 file changed, 42 insertions(+) + arch/arm/mach-ixp4xx/nas100d-setup.c | 43 +++++++++++++++++++++++++++++++++++ + 1 file changed, 43 insertions(+) ---- linux-nslu2.orig/arch/arm/mach-ixp4xx/nas100d-setup.c 2006-02-09 13:24:19.000000000 +0100 -+++ linux-nslu2/arch/arm/mach-ixp4xx/nas100d-setup.c 2006-02-09 15:13:56.000000000 +0100 +--- linux-nslu2.orig/arch/arm/mach-ixp4xx/nas100d-setup.c 2006-02-10 19:19:53.000000000 +0100 ++++ linux-nslu2/arch/arm/mach-ixp4xx/nas100d-setup.c 2006-02-10 19:29:18.000000000 +0100 @@ -17,6 +17,8 @@ #include #include @@ -18,7 +18,7 @@ Signed-off-by: John Bowler #include #include #include -@@ -161,11 +163,51 @@ static void __init nas100d_init(void) +@@ -161,11 +163,52 @@ static void __init nas100d_init(void) platform_add_devices(nas100d_devices, ARRAY_SIZE(nas100d_devices)); } @@ -41,6 +41,7 @@ Signed-off-by: John Bowler + */ +static char nas100d_command_line[] __initdata = + "root=/dev/mtdblock2 rootfstype=jffs2 init=/linuxrc " ++ "rtc-pcf8563.probe=0,0x51 " + CONFIG_CMDLINE; + +static void __init nas100d_fixup(struct machine_desc *desc, -- cgit v1.2.3 From 6f45c77c2be8597a5a782d5ac1d18fde8d8f0506 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 11 Feb 2006 15:20:38 +0000 Subject: gaim_cvs: build fix - drop desktop-name-cvs.patch, doesn't apply anymore - work around the strftime %z support test --- packages/gaim/files/configure-strftime.patch | 25 +++++++++++++++++++++++++ packages/gaim/gaim_cvs.bb | 2 +- site/arm-linux | 3 +++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 packages/gaim/files/configure-strftime.patch diff --git a/packages/gaim/files/configure-strftime.patch b/packages/gaim/files/configure-strftime.patch new file mode 100644 index 0000000000..80621055f1 --- /dev/null +++ b/packages/gaim/files/configure-strftime.patch @@ -0,0 +1,25 @@ +--- gaim/configure.ac 2006-02-09 00:04:40.000000000 +0100 ++++ gaim/configure.ac 2006-02-09 22:37:00.000000000 +0100 +@@ -111,6 +111,14 @@ + AC_CHECK_FUNC(dlopen, LIBDL="", [AC_CHECK_LIB(dl, dlopen, LIBDL="-ldl")]) + + AC_MSG_CHECKING(for the %z format string in strftime()) ++ ++if test "x$gaim_cv_HAVE_STRFTIME_Z_FORMAT" = "xyes"; then ++ AC_MSG_RESULT(yes) ++ AC_DEFINE([HAVE_STRFTIME_Z_FORMAT], [1], ++ [Define to 1 if you have a strftime() that supports the %z format string.]) ++elif test "x$gaim_cv_HAVE_STRFTIME_Z_FORMAT" = "xno"; then ++ AC_MSG_RESULT(no) ++else + AC_TRY_RUN([ + #ifdef HAVE_SYS_TIME_H + #include +@@ -145,6 +153,7 @@ + AC_MSG_RESULT(no) + ] + ) ++fi + + + dnl ####################################################################### diff --git a/packages/gaim/gaim_cvs.bb b/packages/gaim/gaim_cvs.bb index 801ec7dd25..2505b1b9eb 100644 --- a/packages/gaim/gaim_cvs.bb +++ b/packages/gaim/gaim_cvs.bb @@ -4,8 +4,8 @@ PV = "2.0+cvs-${SRCDATE}" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gaim;module=gaim \ file://no-superimposed-version-on-logo.patch;patch=1 \ - file://desktop-name-cvs.patch;patch=1 \ file://gtk-deprecated-2.0.0.patch;patch=1 \ + file://configure-strftime.patch;patch=1 \ " include gaim.inc diff --git a/site/arm-linux b/site/arm-linux index e3e9968725..95596c989f 100644 --- a/site/arm-linux +++ b/site/arm-linux @@ -362,3 +362,6 @@ with_broken_putenv=${with_broken_putenv=no} # xffm jm_cv_func_working_readdir=yes + +# gaim +gaim_cv_HAVE_STRFTIME_Z_FORMAT=${gaim_cv_HAVE_STRFTIME_Z_FORMAT=yes} -- cgit v1.2.3 From 93b28d1fb7d8de6bfc78a01108ea45c31718ab50 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Sat, 11 Feb 2006 17:32:28 +0000 Subject: sharp-sdmmc-support: unbreak it if kernel is not yet built - close #679 taken from .oz354fam083 --- packages/sharp-binary-only/sharp-sdmmc-support.bb | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/packages/sharp-binary-only/sharp-sdmmc-support.bb b/packages/sharp-binary-only/sharp-sdmmc-support.bb index d54402efd3..8d5cc70317 100644 --- a/packages/sharp-binary-only/sharp-sdmmc-support.bb +++ b/packages/sharp-binary-only/sharp-sdmmc-support.bb @@ -1,13 +1,22 @@ -DESCRIPTION = "Driver for the SHARP Zaurus SD/MMC Slot for linux ${KERNEL_VERSION}" +DESCRIPTION = "Driver for the SHARP Zaurus SD/MMC Slot for linux ${PV}" SECTION = "kernel/modules" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "CLOSED" -RDEPENDS = "kernel (${KERNEL_VERSION})" -PV = "${KERNEL_VERSION}" -PR = "r22" +RDEPENDS = "kernel (${PV})" +PR = "r23" PACKAGE_ARCH = "${MACHINE}" +KERNEL2418 = "2.4.18-rmk7-pxa3-embedix" +KERNEL2420 = "2.4.20" + +PV_collie = "${KERNEL2418}" +PV_poodle = "${KERNEL2418}" +PV_tosa = "${KERNEL2418}" +PV_akita = "${KERNEL2420}" +PV_borzoi = "${KERNEL2420}" +PV_spitz = "${KERNEL2420}" + SRC_URI = "http://www.openzaurus.org/mirror/sd-modules-2.4.18-rmk7-pxa3-embedix-r4.tar.bz2 \ file://sd \ file://sdmgr \ -- cgit v1.2.3 From 4b25f82bdd18a61ea6c45d513922880e878dac26 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Sat, 11 Feb 2006 20:33:52 +0000 Subject: efl.bbclass: Fix efl/*.bb ipk generation. --- classes/efl.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/efl.bbclass b/classes/efl.bbclass index 7f218f2e79..4762825e2e 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -73,7 +73,7 @@ do_stage_append () { fi } -PACKAGES += "${SRCNAME} ${SRCNAME}-themes ${SRCNAME}-dev ${SRCNAME}-examples" +PACKAGES = "${SRCNAME} ${SRCNAME}-themes ${SRCNAME}-dev ${SRCNAME}-examples " FILES_${SRCNAME} = "${libdir}/lib*.so*" FILES_${SRCNAME}-themes = "${datadir}/${SRCNAME}/themes ${datadir}/${SRCNAME}/data ${datadir}/${SRCNAME}/fonts ${datadir}/${SRCNAME}/pointers ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/users ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/styles" FILES_${SRCNAME}-dev += "${bindir}/${SRCNAME}-config ${libdir}/pkgconfig ${libdir}/lib*.?a ${datadir}/${SRCNAME}/include" -- cgit v1.2.3 From 92f271865c4af0d07917b36e06ebda5043b36607 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Sat, 11 Feb 2006 21:13:04 +0000 Subject: efl.bbclass: switch to from to work around bitbake problems, switch from += as package.bbclass breaks on it --- classes/efl.bbclass | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/classes/efl.bbclass b/classes/efl.bbclass index 7f218f2e79..626268b50a 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -73,9 +73,8 @@ do_stage_append () { fi } -PACKAGES += "${SRCNAME} ${SRCNAME}-themes ${SRCNAME}-dev ${SRCNAME}-examples" -FILES_${SRCNAME} = "${libdir}/lib*.so*" -FILES_${SRCNAME}-themes = "${datadir}/${SRCNAME}/themes ${datadir}/${SRCNAME}/data ${datadir}/${SRCNAME}/fonts ${datadir}/${SRCNAME}/pointers ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/users ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/styles" -FILES_${SRCNAME}-dev += "${bindir}/${SRCNAME}-config ${libdir}/pkgconfig ${libdir}/lib*.?a ${datadir}/${SRCNAME}/include" -FILES_${SRCNAME}-examples = "${bindir} ${datadir}" - +PACKAGES = "${PN} ${PN}-themes ${PN}-dev ${PN}-examples" +FILES_${PN} = "${libdir}/lib*.so*" +FILES_${PN}-themes = "${datadir}/${PN}/themes ${datadir}/${PN}/data ${datadir}/${PN}/fonts ${datadir}/${PN}/pointers ${datadir}/${PN}/images ${datadir}/${PN}/users ${datadir}/${PN}/images ${datadir}/${PN}/styles" +FILES_${PN}-dev = "${bindir}/${PN}-config ${libdir}/pkgconfig ${libdir}/lib*.?a ${libdir}/lib*.a ${datadir}/${PN}/include" +FILES_${PN}-examples = "${bindir} ${datadir}" -- cgit v1.2.3 From 269cb6277fed3b198feb6f2a95daae0e84cebd1c Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Sat, 11 Feb 2006 21:17:39 +0000 Subject: e17-gpe-menu-convert: remove , add PATH_TO_PIXMAPS, switch tabs to spaces, switch RDEPENDS back to libedje-dev, remove postinst for now --- .../e17-gpe-menu-convert/e17-gpe-menu-convert.sh | 157 +++++++++++---------- packages/e17/e17-gpe-menu-convert_0.2.bb | 11 +- 2 files changed, 85 insertions(+), 83 deletions(-) diff --git a/packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh b/packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh index cf144272ec..63e984d7f6 100644 --- a/packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh +++ b/packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh @@ -2,26 +2,26 @@ setVar() { if [ ! "$value" = "" ]; then - name=`echo "$name" | sed 'y:-\[\]:_____:'` - value=`echo "$value" | sed 's:":\\\":g'` - export $name="$value" + name=`echo "$name" | sed 'y:-\[\]:_____:'` + value=`echo "$value" | sed 's:":\\\":g'` + export $name="$value" fi } #convert true/false to 1/0 bool() { if [ ! "$1" = "" ]; then - if [ "$1" = "True" ]; then - cmd="$cmd $2 1" - else - cmd="$cmd $2 0" - fi + if [ "$1" = "True" ]; then + cmd="$cmd $2 1" + else + cmd="$cmd $2 0" + fi fi } str() { if [ ! "$1" = "" ]; then - cmd="$cmd $2 \"$1"\" + cmd="$cmd $2 \"$1"\" fi } @@ -29,30 +29,30 @@ convert_desktop_to_eap() { echo "Converting $1 to $2" for l in `cat $1`; do #on empty line clear vars - if [ "$l" = "" ]; then - - #grab previous var if it exists - setVar - - name="" - value="" - else - #if an = is in the line it's a name/value pair - if echo "$l" | grep -q "="; then - - #grab previous var if it exists - setVar - - name=`echo "$l" | cut -d "=" -f 1` - value=`echo "$l" | cut -d "=" -f 2-` - else - - #if previous value assume this is a continuation - if [ ! "$value" = "" ]; then - value="$value $l" - fi - fi - fi + if [ "$l" = "" ]; then + + #grab previous var if it exists + setVar + + name="" + value="" + else + #if an = is in the line it's a name/value pair + if echo "$l" | grep -q "="; then + + #grab previous var if it exists + setVar + + name=`echo "$l" | cut -d "=" -f 1` + value=`echo "$l" | cut -d "=" -f 2-` + else + + #if previous value assume this is a continuation + if [ ! "$value" = "" ]; then + value="$value $l" + fi + fi + fi done setVar @@ -70,66 +70,67 @@ convert_desktop_to_eap() { ##enlightenment_eapp | grep -- -set- | cut -d " " -f 3 | xargs -iCMD enlightenment_eapp gpe-othello.eap CMD \"\" #enlightenment_eapp gpe-othello.eap -del-all - cat < /tmp/gpeEap.edc + cat < /tmp/gpeEap.edc images { image: "$Icon" COMP; } collections { group { - name: "icon"; - max: 48 48; - parts { - part { - name: "image"; - mouse_events: 0; - description { - state: "default" 0.0; - aspect: 1.0 1.0; - image.normal: "$Icon"; - } - } - } + name: "icon"; + max: 48 48; + parts { + part { + name: "image"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + image.normal: "$Icon"; + } + } + } } } EOF - edje_cc --image_dir /usr/share/pixmaps /tmp/gpeEap.edc "$PATH_TO_EAP/$2" - rm /tmp/gpeEap.edc + edje_cc --image_dir "$PATH_TO_PIXMAPS" /tmp/gpeEap.edc "$PATH_TO_EAP/$2" + rm /tmp/gpeEap.edc - cmd="enlightenment_eapp \"$PATH_TO_EAP/$2\" $cmd" + cmd="enlightenment_eapp \"$PATH_TO_EAP/$2\" $cmd" #pipe command in sh to allow it to re-interpret quotes - echo $cmd | /bin/sh -s - - if `echo "$Categories" | grep -q "SystemSettings"`; then - dir="Settings" - elif `echo "$Categories" | grep -q "PIM"`; then - dir="PIM" - elif `echo "$Categories" | grep -q "Network"`; then - dir="Network" - elif `echo "$Categories" | grep -q "Games"`; then - dir="Games" - elif `echo "$Categories" | grep -q "Game"`; then - dir="Games" - elif `echo "$Categories" | grep -q "AudioVideo"`; then - dir="Multimedia" - elif `echo "$Categories" | grep -q "Panel"`; then - dir="Utility/Panel" - elif `echo "$Categories" | grep -q "Utility"`; then - dir="Utlity" - else - dir="" - fi - - #dir=`echo "$Categories" | sed 'y:;:/:'` - mkdir -p "$PATH_TO_E_GPE/$dir" - echo "$2" >> "$PATH_TO_E_GPE/$dir"/.order + echo $cmd | /bin/sh -s + + if `echo "$Categories" | grep -q "SystemSettings"`; then + dir="Settings" + elif `echo "$Categories" | grep -q "PIM"`; then + dir="PIM" + elif `echo "$Categories" | grep -q "Network"`; then + dir="Network" + elif `echo "$Categories" | grep -q "Games"`; then + dir="Games" + elif `echo "$Categories" | grep -q "Game"`; then + dir="Games" + elif `echo "$Categories" | grep -q "AudioVideo"`; then + dir="Multimedia" + elif `echo "$Categories" | grep -q "Panel"`; then + dir="Utility/Panel" + elif `echo "$Categories" | grep -q "Utility"`; then + dir="Utlity" + else + dir="" + fi + + #dir=`echo "$Categories" | sed 'y:;:/:'` + mkdir -p "$PATH_TO_E_GPE/$dir" + echo "$2" >> "$PATH_TO_E_GPE/$dir"/.order fi } -PATH_TO_DESKTOP="${IMAGE_ROOTFS}/usr/share/applications" -PATH_TO_EAP="${IMAGE_ROOTFS}/home/root/.e/e/applications/all" -PATH_TO_E_GPE="${IMAGE_ROOTFS}/home/root/.e/e/applications/favorite/GPE" +PATH_TO_DESKTOP="/usr/share/applications" +PATH_TO_PIXMAPS="/usr/share/pixmaps" +PATH_TO_EAP="/home/root/.e/e/applications/all" +PATH_TO_E_GPE="/home/root/.e/e/applications/favorite/GPE" if [ ! -d $PATH_TO_E_GPE ]; then mkdir -p $PATH_TO_E_GPE diff --git a/packages/e17/e17-gpe-menu-convert_0.2.bb b/packages/e17/e17-gpe-menu-convert_0.2.bb index b83cba6209..fd55d34915 100644 --- a/packages/e17/e17-gpe-menu-convert_0.2.bb +++ b/packages/e17/e17-gpe-menu-convert_0.2.bb @@ -1,10 +1,11 @@ DESCRIPTION = "Shell script to convert GPE .desktop files into e17 eap files and menus" DEPENDS = "edje e-wm" -RDEPENDS += "edje-utils e-wm" +#RDEPENDS += "edje-utils e-wm" +RDEPENDS += "libedje-dev e-wm" LICENSE = "MIT" SECTION = "e/apps" MAINTAINER = "Justin Patrin " -PR = "r0" +PR = "r1" SRC_URI = "file://e17-gpe-menu-convert.sh" @@ -13,6 +14,6 @@ do_install() { install -m 755 ${WORKDIR}/e17-gpe-menu-convert.sh ${D}/usr/bin/e17-gpe-menu-convert.sh } -pkg_postinst() { - /usr/bin/e17-gpe-menu-convert.sh 2>&1 > /tmp/gpe-menu-convert.log -} \ No newline at end of file +#pkg_postinst() { +# /usr/bin/e17-gpe-menu-convert.sh +#} \ No newline at end of file -- cgit v1.2.3 From a80310923d9e686baf752edfc48c4e050d4bfd71 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Sat, 11 Feb 2006 21:21:04 +0000 Subject: edb, embryo, edje: remove -utils packages as package.bbclass can't handle it --- packages/efl/edb_1.0.5.005.bb | 11 +++++++---- packages/efl/edje_0.5.0.023.bb | 14 ++++++++++---- packages/efl/embryo_0.9.1.023.bb | 9 ++++++--- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/packages/efl/edb_1.0.5.005.bb b/packages/efl/edb_1.0.5.005.bb index 620b39d301..5550538afb 100644 --- a/packages/efl/edb_1.0.5.005.bb +++ b/packages/efl/edb_1.0.5.005.bb @@ -2,11 +2,14 @@ DESCRIPTION = "EDB is a database convenience library wrapped around the \ Berkeley DB 2.7.7 by Sleepycat Software." DEPENDS = "zlib ncurses" LICENSE = "BSD" -PR = "r2" +PR = "r3" -PACKAGES = "edb-utils" -FILES_edb-utils = "${bindir}/edb_ed ${bindir}/edb_vt_ed ${bindir}/edb_gtk_ed" -RDEPENDS_edb-utils += "ncurses" +## package.bbclass kills packages when there are duplicates, this means +## that efl.bbclass can't have PACKAGES += and so the FILES for previous +## packages take precedence over -utils +#PACKAGES = "edb-utils" +#FILES_edb-utils = "${bindir}/edb_ed ${bindir}/edb_vt_ed ${bindir}/edb_gtk_ed" +#RDEPENDS_edb-utils += "ncurses" inherit efl diff --git a/packages/efl/edje_0.5.0.023.bb b/packages/efl/edje_0.5.0.023.bb index b0fbda0acb..11662b226a 100644 --- a/packages/efl/edje_0.5.0.023.bb +++ b/packages/efl/edje_0.5.0.023.bb @@ -2,14 +2,20 @@ DESCRIPTION = "Edje is a complex graphical design & layout library." # can also install vim data files DEPENDS = "virtual/evas virtual/ecore eet embryo edje-native virtual/imlib2" LICENSE = "MIT" -PR = "r4" +PR = "r5" -PACKAGES = "edje-utils" -FILES_edje-utils = "${bindir}/edje ${bindir}/edje_* ${datadir}/edje/data/template ${datadir}/edje/include" -RDEPENDS_edje-utils += "embryo-utils cpp" +## package.bbclass kills packages when there are duplicates, this means +## that efl.bbclass can't have PACKAGES += and so the FILES for previous +## packages take precedence over -utils +#PACKAGES = "edje-utils" +#RPROVIDES_edje-utils += "libedje-utils" +#FILES_edje-utils = "${bindir}/edje ${bindir}/edje_* ${datadir}/edje/data/template ${datadir}/edje/include" +#RDEPENDS_edje-utils += "libembryo-utils cpp cpp-symlinks gcc gcc-symlinks" inherit efl +RDEPENDS_${PN}-dev += "libembryo-dev cpp cpp-symlinks gcc gcc-symlinks" + FILES_${SRCNAME}-themes = "" SRC_URI += "cvs://anonymous@thinktux.net/root;module=e17/libs/edje/m4;date=20060101" diff --git a/packages/efl/embryo_0.9.1.023.bb b/packages/efl/embryo_0.9.1.023.bb index f5582ef9c2..603a0c8b47 100644 --- a/packages/efl/embryo_0.9.1.023.bb +++ b/packages/efl/embryo_0.9.1.023.bb @@ -4,9 +4,12 @@ CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999. \ Embryo allows scripting capabilities in places that otherwise wouldn't support \ basic programming structures such as in Edje EDCs." LICENSE = "MIT" -PR = "r2" +PR = "r3" -PACKAGES = "embryo-utils" -FILES_embryo-utils = "${bindir}/embryo ${bindir}/embryo_* ${datadir}/embryo/include" +## package.bbclass kills packages when there are duplicates, this means +## that efl.bbclass can't have PACKAGES += and so the FILES for previous +## packages take precedence over -utils +#PACKAGES = "embryo-utils" +#FILES_embryo-utils = "${bindir}/embryo ${bindir}/embryo_* ${datadir}/embryo/include" inherit efl -- cgit v1.2.3 From 2b190ae64023b20ca157690b4f4485e09f00de15 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Sat, 11 Feb 2006 21:23:37 +0000 Subject: evas-x11: --enable-buffer, edje_cc needs it --- packages/efl/evas-x11_0.9.9.023.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/efl/evas-x11_0.9.9.023.bb b/packages/efl/evas-x11_0.9.9.023.bb index 75a080a26c..ba8b74aae2 100644 --- a/packages/efl/evas-x11_0.9.9.023.bb +++ b/packages/efl/evas-x11_0.9.9.023.bb @@ -1,12 +1,12 @@ include evas.inc DEPENDS += "x11 xext freetype" -PR = "r3" +PR = "r4" EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR} \ --enable-fb \ --disable-directfb \ - --disable-buffer \ + --enable-buffer \ --disable-software-qtopia \ --enable-software-x11 \ --disable-gl-x11 \ -- cgit v1.2.3 From 21bec54daf88e907825a7af8fd85b52f0e0cefb1 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Sat, 11 Feb 2006 21:24:21 +0000 Subject: evas.inc: remove unneeded do_configure --- packages/efl/evas.inc | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc index 37f0efaab1..a8b4e85f4f 100644 --- a/packages/efl/evas.inc +++ b/packages/efl/evas.inc @@ -29,13 +29,5 @@ do_configure_prepend() { fi } -do_configure () { - autotools_do_configure - #find ${S} -type f | xargs sed -i 's:@FREETYPE_CFLAGS@:-I${STAGING_INCDIR}/freetype2:' - #find ${S} -name Makefile | xargs sed -i 's:--tag=CC:-lfreetype --tag=CC:' -} - - headers = "" -libraries = "libevas" - +libraries = "libevas" \ No newline at end of file -- cgit v1.2.3 From 3b7f2a26631855caf28ea8241796389417e78a68 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Sat, 11 Feb 2006 21:25:37 +0000 Subject: task-e-x11-core: add new e bootsplash --- packages/meta/task-e-x11.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/meta/task-e-x11.bb b/packages/meta/task-e-x11.bb index 00b233e81c..0854cfd43a 100644 --- a/packages/meta/task-e-x11.bb +++ b/packages/meta/task-e-x11.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Tasks for Enlightenment/X11" PACKAGES = "task-e-x11-core task-e-x11" PROVIDES = "task-e-x11-core task-e-x11" -PR = "r7" +PR = "r8" FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \ e##http://openzaurus.org/official/unstable/3.5.2/feed/e" @@ -14,7 +14,7 @@ ALLOW_EMPTY = 1 # X # RDEPENDS_task-e-x11-core = "rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \ - ttf-bitstream-vera chkhinge" + ttf-bitstream-vera chkhinge gpe-bootsplash-theme-e" # # E-core -- cgit v1.2.3 From 1f601d09b53593fc41d3bc7f1f30fac2a4376fdc Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Sat, 11 Feb 2006 21:27:47 +0000 Subject: efl: bump PRs --- packages/efl/e_0.16.999.023.bb | 2 +- packages/efl/ecore-x11_0.9.9.023.bb | 2 +- packages/efl/eet_0.9.10.023.bb | 2 +- packages/efl/imlib2-x11_1.2.1.010.bb | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/efl/e_0.16.999.023.bb b/packages/efl/e_0.16.999.023.bb index 35bb776269..0f400d51cc 100644 --- a/packages/efl/e_0.16.999.023.bb +++ b/packages/efl/e_0.16.999.023.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Enlightenment Window Mananger Library" DEPENDS = "virtual/evas virtual/ecore edje eet embryo" LICENSE = "MIT" -PR = "r1" +PR = "r2" inherit efl diff --git a/packages/efl/ecore-x11_0.9.9.023.bb b/packages/efl/ecore-x11_0.9.9.023.bb index 0927b59e03..40527561aa 100644 --- a/packages/efl/ecore-x11_0.9.9.023.bb +++ b/packages/efl/ecore-x11_0.9.9.023.bb @@ -1,6 +1,6 @@ include ecore.inc DEPENDS += "evas-x11" -PR = "r2" +PR = "r3" SRC_URI += "file://evas-x11-include.patch;patch=1" diff --git a/packages/efl/eet_0.9.10.023.bb b/packages/efl/eet_0.9.10.023.bb index c0f89b1064..6e6032e098 100644 --- a/packages/efl/eet_0.9.10.023.bb +++ b/packages/efl/eet_0.9.10.023.bb @@ -4,6 +4,6 @@ each chunk (very much like a zip file) and allow fast \ random-access reading of the file later on." DEPENDS = "zlib jpeg" LICENSE = "BSD" -PR = "r1" +PR = "r2" inherit efl diff --git a/packages/efl/imlib2-x11_1.2.1.010.bb b/packages/efl/imlib2-x11_1.2.1.010.bb index 165321355c..d13d24165a 100644 --- a/packages/efl/imlib2-x11_1.2.1.010.bb +++ b/packages/efl/imlib2-x11_1.2.1.010.bb @@ -1,5 +1,6 @@ include imlib2.inc DEPENDS += "x11 xext" +PR = "r1" EXTRA_OECONF = "--disable-mmx \ --with-x \ -- cgit v1.2.3 From 436341343973f1899668d4f348f90abaee42779a Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 11 Feb 2006 23:03:46 +0000 Subject: ixp4xx: Updated ixp4xx-header.patch for 2.6.16 --- conf/distro/ludeos.conf | 14 ++++++++++++++ packages/ixp4xx/ixp-osal-2.1/ixp4xx-header.patch | 10 +++++++++- packages/ixp4xx/ixp-osal_2.1.bb | 2 +- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/conf/distro/ludeos.conf b/conf/distro/ludeos.conf index fad8d4e04f..5ebe98b254 100644 --- a/conf/distro/ludeos.conf +++ b/conf/distro/ludeos.conf @@ -19,4 +19,18 @@ FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/slugos-lag/native # This removes the dependency on upslug2-native. SLUGOS_NATIVE_DEPENDS = "" +SLUGOS_EXTRA_RDEPENDS = "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck \ +kernel-module-ext2 \ +kernel-module-jbd \ +kernel-module-ext3 \ +kernel-module-nfs \ +kernel-module-vfat \ +kernel-module-ntfs \ +kernel-module-isofs \ +kernel-module-udf \ +kernel-module-reiserfs \ +kernel-module-nls-cp437 \ +kernel-module-nls-utf8 \ +" + include conf/distro/slugos.conf diff --git a/packages/ixp4xx/ixp-osal-2.1/ixp4xx-header.patch b/packages/ixp4xx/ixp-osal-2.1/ixp4xx-header.patch index 70eec5e728..a9d87d4b56 100644 --- a/packages/ixp4xx/ixp-osal-2.1/ixp4xx-header.patch +++ b/packages/ixp4xx/ixp-osal-2.1/ixp4xx-header.patch @@ -32,13 +32,14 @@ "qMgr" /* name */ --- ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Base.h 1970-01-01 00:00:00.000000000 +0000 +++ ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Base.h 1970-01-01 00:00:00.000000000 +0000 -@@ -0,0 +1,72 @@ +@@ -0,0 +1,80 @@ +/* + * Glue for the current linux definitons of this stuff. + */ +#ifndef IxOsalOsIxp425Base_H +#define IxOsalOsIxp425Base_H 1 +#include ++#include + +/* Force Address Coherent (the default) mapping on LE - Linux 2.6 + * does not have a way of changing it. @@ -64,7 +65,14 @@ +#define IXP425_PCI_CFG_BASE_PHYS IXP4XX_PCI_CFG_BASE_PHYS + +//#define IXP425_EXP_BUS_BASE1_PHYS ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16) +#define IXP425_EXP_BUS_BASE2_PHYS IXP4XX_EXP_BUS_CS2_BASE_PHYS ++#else ++/* The following definition should be IXP4XX_EXP_BUS_BASE(2), but that is not ++ static and causes compilation problems later. So we need to hard-code it. ++ Note that this hard-coded value is only correct for IXP42X. */ ++#define IXP425_EXP_BUS_BASE2_PHYS (IXP4XX_EXP_BUS_BASE_PHYS + (2 * SZ_16M)) ++#endif +//#define IXP425_EXP_BUS_CS0_BASE_PHYS +//#define IXP425_EXP_BUS_CS1_BASE_PHYS +//#define IXP425_EXP_BUS_CS4_BASE_PHYS diff --git a/packages/ixp4xx/ixp-osal_2.1.bb b/packages/ixp4xx/ixp-osal_2.1.bb index 48d4355648..7a27e2848e 100644 --- a/packages/ixp4xx/ixp-osal_2.1.bb +++ b/packages/ixp4xx/ixp-osal_2.1.bb @@ -31,7 +31,7 @@ SRC_URI += "file://le.patch;patch=1" SRC_URI += "file://assert.patch;patch=1" S = "${WORKDIR}/ixp_osal" -PR = "r3" +PR = "r4" COMPATIBLE_HOST = "^arm.*-linux.*" -- cgit v1.2.3 From 96ac70dfc27d393942503e029d8fba7b0a8f67b6 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Sun, 12 Feb 2006 07:05:11 +0000 Subject: efl.bbclass: include is now part of -utils packages, not -dev packages --- classes/efl.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/efl.bbclass b/classes/efl.bbclass index 626268b50a..078f874520 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -76,5 +76,5 @@ do_stage_append () { PACKAGES = "${PN} ${PN}-themes ${PN}-dev ${PN}-examples" FILES_${PN} = "${libdir}/lib*.so*" FILES_${PN}-themes = "${datadir}/${PN}/themes ${datadir}/${PN}/data ${datadir}/${PN}/fonts ${datadir}/${PN}/pointers ${datadir}/${PN}/images ${datadir}/${PN}/users ${datadir}/${PN}/images ${datadir}/${PN}/styles" -FILES_${PN}-dev = "${bindir}/${PN}-config ${libdir}/pkgconfig ${libdir}/lib*.?a ${libdir}/lib*.a ${datadir}/${PN}/include" +FILES_${PN}-dev = "${bindir}/${PN}-config ${libdir}/pkgconfig ${libdir}/lib*.?a ${libdir}/lib*.a" FILES_${PN}-examples = "${bindir} ${datadir}" -- cgit v1.2.3 From 3bea7132522df1db4783ea5492aa3631bc435f00 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Sun, 12 Feb 2006 07:16:23 +0000 Subject: edje, embryo, edb: split out binary programs into -utils packages again - This time the -utils packages have their own bbs so they don't get their names auto-munged and so can be RDEPENDed on --- packages/efl/edb-utils_1.0.5.005.bb | 19 +++++++++++++++++++ packages/efl/edb_1.0.5.005.bb | 11 +++-------- packages/efl/edje-utils_0.5.0.023.bb | 23 +++++++++++++++++++++++ packages/efl/edje_0.5.0.023.bb | 4 ++-- packages/efl/embryo-utils_0.9.1.023.bb | 18 ++++++++++++++++++ packages/efl/embryo_0.9.1.023.bb | 10 +++------- 6 files changed, 68 insertions(+), 17 deletions(-) create mode 100644 packages/efl/edb-utils_1.0.5.005.bb create mode 100644 packages/efl/edje-utils_0.5.0.023.bb create mode 100644 packages/efl/embryo-utils_0.9.1.023.bb diff --git a/packages/efl/edb-utils_1.0.5.005.bb b/packages/efl/edb-utils_1.0.5.005.bb new file mode 100644 index 0000000000..401d0e7e46 --- /dev/null +++ b/packages/efl/edb-utils_1.0.5.005.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "EDB is a database convenience library wrapped around the \ +Berkeley DB 2.7.7 by Sleepycat Software." +DEPENDS = "zlib ncurses" +LICENSE = "BSD" +PR = "r4" + +inherit efl + +EXTRA_OECONF += "--disable-gtk" + +PACKAGES = "edb-utils" +FILES_${PN} = "${bindir}/edb_ed ${bindir}/edb_vt_ed ${bindir}/edb_gtk_ed" +RDEPENDS_${PN} += "ncurses" + +SRC_URI = "http://enlightenment.freedesktop.org/files/edb-${PV}.tar.gz" +S = "${WORKDIR}/edb-${PV}" + +libraries = "" +headers = "" diff --git a/packages/efl/edb_1.0.5.005.bb b/packages/efl/edb_1.0.5.005.bb index 5550538afb..6f771fb0de 100644 --- a/packages/efl/edb_1.0.5.005.bb +++ b/packages/efl/edb_1.0.5.005.bb @@ -2,17 +2,12 @@ DESCRIPTION = "EDB is a database convenience library wrapped around the \ Berkeley DB 2.7.7 by Sleepycat Software." DEPENDS = "zlib ncurses" LICENSE = "BSD" -PR = "r3" - -## package.bbclass kills packages when there are duplicates, this means -## that efl.bbclass can't have PACKAGES += and so the FILES for previous -## packages take precedence over -utils -#PACKAGES = "edb-utils" -#FILES_edb-utils = "${bindir}/edb_ed ${bindir}/edb_vt_ed ${bindir}/edb_gtk_ed" -#RDEPENDS_edb-utils += "ncurses" +PR = "r4" inherit efl EXTRA_OECONF += "--disable-gtk" libdirectory = "src" + +FILES_${PN}-examples = "" diff --git a/packages/efl/edje-utils_0.5.0.023.bb b/packages/efl/edje-utils_0.5.0.023.bb new file mode 100644 index 0000000000..6432fc1267 --- /dev/null +++ b/packages/efl/edje-utils_0.5.0.023.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Edje is a complex graphical design & layout library." +DEPENDS = "edje" +LICENSE = "MIT" +PR = "r6" + +inherit efl + +PACKAGES = "edje-utils" +FILES_${PN} = "${bindir}/edje ${bindir}/edje_* ${datadir}/edje/data/template ${datadir}/edje/include" +RDEPENDS_${PN} += "embryo-utils cpp cpp-symlinks gcc gcc-symlinks" + +SRC_URI = "http://enlightenment.freedesktop.org/files/edje-${PV}.tar.gz \ + cvs://anonymous@thinktux.net/root;module=e17/libs/edje/m4;date=20060101" +S = "${WORKDIR}/edje-${PV}" + +libraries = "" +headers = "" + +do_configure_prepend() { + install -d "${S}/m4" + install "${WORKDIR}/m4/"*.m4 "${S}/m4" + aclocal -I m4 +} diff --git a/packages/efl/edje_0.5.0.023.bb b/packages/efl/edje_0.5.0.023.bb index 11662b226a..43e135ac5d 100644 --- a/packages/efl/edje_0.5.0.023.bb +++ b/packages/efl/edje_0.5.0.023.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Edje is a complex graphical design & layout library." # can also install vim data files DEPENDS = "virtual/evas virtual/ecore eet embryo edje-native virtual/imlib2" LICENSE = "MIT" -PR = "r5" +PR = "r6" ## package.bbclass kills packages when there are duplicates, this means ## that efl.bbclass can't have PACKAGES += and so the FILES for previous @@ -14,7 +14,7 @@ PR = "r5" inherit efl -RDEPENDS_${PN}-dev += "libembryo-dev cpp cpp-symlinks gcc gcc-symlinks" +FILES_${PN}-examples = "${datadir}/edje/data/images ${datadir}/edje/data/src ${datadir}/edje/data/test ${datadir}/edje/data/*.sh" FILES_${SRCNAME}-themes = "" diff --git a/packages/efl/embryo-utils_0.9.1.023.bb b/packages/efl/embryo-utils_0.9.1.023.bb new file mode 100644 index 0000000000..7899e4aa2f --- /dev/null +++ b/packages/efl/embryo-utils_0.9.1.023.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Embryo implements a C like scripting language used in various parts \ +of the Enlightenment project, namely Edje. Embryo's scripting language is based on \ +CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999. \ +Embryo allows scripting capabilities in places that otherwise wouldn't support \ +basic programming structures such as in Edje EDCs." +LICENSE = "MIT" +PR = "r4" + +inherit efl + +SRC_URI = "http://enlightenment.freedesktop.org/files/embryo-${PV}.tar.gz" +S = "${WORKDIR}/embryo-${PV}" + +PACKAGES = "embryo-utils" +FILES_${PN} = "${bindir}/embryo ${bindir}/embryo_* ${datadir}/embryo/include" + +libraries = "" +headers = "" diff --git a/packages/efl/embryo_0.9.1.023.bb b/packages/efl/embryo_0.9.1.023.bb index 603a0c8b47..65345eff94 100644 --- a/packages/efl/embryo_0.9.1.023.bb +++ b/packages/efl/embryo_0.9.1.023.bb @@ -4,12 +4,8 @@ CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999. \ Embryo allows scripting capabilities in places that otherwise wouldn't support \ basic programming structures such as in Edje EDCs." LICENSE = "MIT" -PR = "r3" - -## package.bbclass kills packages when there are duplicates, this means -## that efl.bbclass can't have PACKAGES += and so the FILES for previous -## packages take precedence over -utils -#PACKAGES = "embryo-utils" -#FILES_embryo-utils = "${bindir}/embryo ${bindir}/embryo_* ${datadir}/embryo/include" +PR = "r4" inherit efl + +FILES_${PN}-examples = "${datadir}/${PN}/examples" -- cgit v1.2.3 From c4175020f8f400a7fe4ea6cd3d0cbc8578944d3b Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Sun, 12 Feb 2006 07:29:48 +0000 Subject: e17-gpe-menu-convert: put back RDEPEND on edje-utils now that it's fixed --- packages/e17/e17-gpe-menu-convert_0.2.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/e17/e17-gpe-menu-convert_0.2.bb b/packages/e17/e17-gpe-menu-convert_0.2.bb index fd55d34915..d79a501884 100644 --- a/packages/e17/e17-gpe-menu-convert_0.2.bb +++ b/packages/e17/e17-gpe-menu-convert_0.2.bb @@ -1,11 +1,10 @@ DESCRIPTION = "Shell script to convert GPE .desktop files into e17 eap files and menus" DEPENDS = "edje e-wm" -#RDEPENDS += "edje-utils e-wm" -RDEPENDS += "libedje-dev e-wm" +RDEPENDS += "edje-utils e-wm" LICENSE = "MIT" SECTION = "e/apps" MAINTAINER = "Justin Patrin " -PR = "r1" +PR = "r2" SRC_URI = "file://e17-gpe-menu-convert.sh" -- cgit v1.2.3 From 2766ea08070fae6b438cd5a4ed7277e9ea17e835 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sun, 12 Feb 2006 13:24:52 +0000 Subject: gaim_cvs: drop strftime and desktop-name patches - Drop the configure-strftime.patch again. Upstream decided to always enable the compatibility code when cross compiling. - Delete the unused desktop-name-cvs.patch. --- packages/gaim/files/configure-strftime.patch | 25 --------------------- packages/gaim/files/desktop-name-cvs.patch | 33 ---------------------------- packages/gaim/gaim_cvs.bb | 1 - site/arm-linux | 3 --- 4 files changed, 62 deletions(-) delete mode 100644 packages/gaim/files/configure-strftime.patch delete mode 100644 packages/gaim/files/desktop-name-cvs.patch diff --git a/packages/gaim/files/configure-strftime.patch b/packages/gaim/files/configure-strftime.patch deleted file mode 100644 index 80621055f1..0000000000 --- a/packages/gaim/files/configure-strftime.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- gaim/configure.ac 2006-02-09 00:04:40.000000000 +0100 -+++ gaim/configure.ac 2006-02-09 22:37:00.000000000 +0100 -@@ -111,6 +111,14 @@ - AC_CHECK_FUNC(dlopen, LIBDL="", [AC_CHECK_LIB(dl, dlopen, LIBDL="-ldl")]) - - AC_MSG_CHECKING(for the %z format string in strftime()) -+ -+if test "x$gaim_cv_HAVE_STRFTIME_Z_FORMAT" = "xyes"; then -+ AC_MSG_RESULT(yes) -+ AC_DEFINE([HAVE_STRFTIME_Z_FORMAT], [1], -+ [Define to 1 if you have a strftime() that supports the %z format string.]) -+elif test "x$gaim_cv_HAVE_STRFTIME_Z_FORMAT" = "xno"; then -+ AC_MSG_RESULT(no) -+else - AC_TRY_RUN([ - #ifdef HAVE_SYS_TIME_H - #include -@@ -145,6 +153,7 @@ - AC_MSG_RESULT(no) - ] - ) -+fi - - - dnl ####################################################################### diff --git a/packages/gaim/files/desktop-name-cvs.patch b/packages/gaim/files/desktop-name-cvs.patch deleted file mode 100644 index d3ab483119..0000000000 --- a/packages/gaim/files/desktop-name-cvs.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- gaim/gaim.desktop.orig 2005-11-03 22:34:17 +0100 -+++ gaim/gaim.desktop 2005-11-03 22:34:50 +0100 -@@ -7,29 +7,7 @@ - Terminal=false - Type=Application - --Name=Gaim Internet Messenger --Name[ca]=Missatger d'Internet Gaim --Name[cs]=Gaim Internet Messenger --Name[da]=Gaim - internet beskeder --Name[de]=Gaim Internet Messenger --Name[es]=Gaim - cliente de mensajería de Internet --Name[fr]=Gaim Messagerie Internet --Name[hu]=Gaim azonnali üzenetküldő --Name[it]=Gaim Internet Messenger --Name[ja]=Gaim インターネット・メッセンジャー --Name[ko]=게임 메신저 --Name[nb]=Gaim lynmeldingsklient --Name[nl]=Gaim - Expresberichten --Name[pl]=Komunikator Internetowy Gaim --Name[pt_BR]=Mensageiro via Internet Gaim --Name[pt]=Mensageiro Internet Gaim --Name[ro]=Mesagerul Gaim --Name[ru]=Gaim - клиент обмена мгновенными сообщениями --Name[sl]=Gaim - spletni sel --Name[sq]=Lajmësjellësi Internet Gaim --Name[sv]=Gaim Internet Messenger --Name[zh_CN]=Gaim 互联网通讯程序 --Name[zh_TW]=Gaim 網路即時通 -+Name=Gaim - - GenericName=Internet Messenger - GenericName[ca]=Missatger d'Internet diff --git a/packages/gaim/gaim_cvs.bb b/packages/gaim/gaim_cvs.bb index 2505b1b9eb..faf707a867 100644 --- a/packages/gaim/gaim_cvs.bb +++ b/packages/gaim/gaim_cvs.bb @@ -5,7 +5,6 @@ PV = "2.0+cvs-${SRCDATE}" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gaim;module=gaim \ file://no-superimposed-version-on-logo.patch;patch=1 \ file://gtk-deprecated-2.0.0.patch;patch=1 \ - file://configure-strftime.patch;patch=1 \ " include gaim.inc diff --git a/site/arm-linux b/site/arm-linux index 95596c989f..e3e9968725 100644 --- a/site/arm-linux +++ b/site/arm-linux @@ -362,6 +362,3 @@ with_broken_putenv=${with_broken_putenv=no} # xffm jm_cv_func_working_readdir=yes - -# gaim -gaim_cv_HAVE_STRFTIME_Z_FORMAT=${gaim_cv_HAVE_STRFTIME_Z_FORMAT=yes} -- cgit v1.2.3 From 6dcf5a170c84ec3fe59ba939b3d37bd8ae06012f Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Sun, 12 Feb 2006 13:57:42 +0000 Subject: altboot - Do not show option for USB boot on devices w/o USB host - Disable "Boot original INIT" - Do not drop into emergency shell on die() but restart altboot with menu (doesn't work for every plugin, yet) - Some fixes / enhancements for tar.gz installer - Remove "orce" error message when cmdline "-force" is used (should have seen this coming heh) --- packages/altboot/altboot.bb | 2 +- packages/altboot/files/akita/altboot-2.4.cfg | 1 + packages/altboot/files/akita/altboot-2.6.cfg | 1 + .../files/altboot-menu/Advanced/30-bootUSB-Stick | 1 + .../altboot/files/altboot-menu/Advanced/40-bootNFS | 2 +- .../files/altboot-menu/Advanced/60-orig-init | 1 + .../files/altboot-menu/Advanced/70-install-tgz | 53 +++++++++++++++------- packages/altboot/files/init.altboot | 8 +++- packages/altboot/files/spitz/altboot-2.4.cfg | 1 + 9 files changed, 49 insertions(+), 21 deletions(-) diff --git a/packages/altboot/altboot.bb b/packages/altboot/altboot.bb index ef87e880c9..ce586f6f4b 100644 --- a/packages/altboot/altboot.bb +++ b/packages/altboot/altboot.bb @@ -6,7 +6,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges " LICENSE = "GPL" IGNORE_STRIP_ERRORS = "1" -PR = "r19" +PR = "r20" SRC_URI = "file://altboot-menu \ diff --git a/packages/altboot/files/akita/altboot-2.4.cfg b/packages/altboot/files/akita/altboot-2.4.cfg index 9175cb1b06..8c404d4768 100644 --- a/packages/altboot/files/akita/altboot-2.4.cfg +++ b/packages/altboot/files/akita/altboot-2.4.cfg @@ -13,6 +13,7 @@ FSCK_IMAGES="yes" SD_DEVICE="/dev/mmcda1" SD_KERNEL_MODULE="/lib/modules/2.4.20/kernel/drivers/block/sharp_mmcsd_m.o" +USB_HOST_AVAILABLE="yes" USB_STORAGE_MODULES="usb_ohci_pxa27x usb-storage" USB_STORAGE_PARTITION="/dev/sda1" USB_STORAGE_WAIT="4" diff --git a/packages/altboot/files/akita/altboot-2.6.cfg b/packages/altboot/files/akita/altboot-2.6.cfg index ad15f7169e..42f0968134 100644 --- a/packages/altboot/files/akita/altboot-2.6.cfg +++ b/packages/altboot/files/akita/altboot-2.6.cfg @@ -13,6 +13,7 @@ FSCK_IMAGES="yes" SD_DEVICE="/dev/mmcblk0p1" SD_KERNEL_MODULE="" +USB_HOST_AVAILABLE="no" USB_STORAGE_MODULES="usb_ohci_pxa27x usb-storage" USB_STORAGE_PARTITION="/dev/sda1" USB_STORAGE_WAIT="4" diff --git a/packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick b/packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick index 3ef17764d0..c5222800e5 100644 --- a/packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick +++ b/packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick @@ -7,6 +7,7 @@ M_TITLE="Boot USB Storage" +test "$USB_HOST_AVAILABLE" = "yes" || exit 0 die() { echo "ERROR: $1" >/dev/tty0 exec $SH_SHELL /dev/tty0 2>&1 diff --git a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS index 818a93943d..cf1d1da8e6 100644 --- a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS +++ b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS @@ -116,7 +116,7 @@ run_module() { # Use configured resolv.conf in the pivoted rootfs echo -n "Copying resolv.conf..." - cp /etc/resolv.conf /media/nfsroot/etc >/dev/null 2>&1 && echo ok || echo "FAILED" + cp /etc/resolv.conf /media/nfsroot/etc && echo ok || echo "FAILED" check_target "/media/nfsroot" diff --git a/packages/altboot/files/altboot-menu/Advanced/60-orig-init b/packages/altboot/files/altboot-menu/Advanced/60-orig-init index 9f4ff78388..ad9f2c78e1 100644 --- a/packages/altboot/files/altboot-menu/Advanced/60-orig-init +++ b/packages/altboot/files/altboot-menu/Advanced/60-orig-init @@ -1,6 +1,7 @@ # !/bin/sh M_TITLE="Boot original INIT" +exit 0 run_module() { diff --git a/packages/altboot/files/altboot-menu/Advanced/70-install-tgz b/packages/altboot/files/altboot-menu/Advanced/70-install-tgz index acf148efb3..2ff380418d 100644 --- a/packages/altboot/files/altboot-menu/Advanced/70-install-tgz +++ b/packages/altboot/files/altboot-menu/Advanced/70-install-tgz @@ -2,10 +2,10 @@ M_TITLE="Install RootFS from tar.gz" -die() { - echo "ERROR: $1" >/dev/tty0 - exec $SH_SHELL /dev/tty0 2>&1 -} +# die() { +# echo "ERROR: $1" >/dev/tty0 +# exec $SH_SHELL /dev/tty0 2>&1 +# } run_module(){ test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" @@ -56,9 +56,9 @@ run_module(){ esac done - echo -e "\nPlease choose the method of this installation:\n" + echo -e "\nPlease choose the type of this installation:\n" - echo -e "\t [1] ImageFile (loopfile)" + echo -e "\t [1] Imagefile (loopfile)" echo -e "\t [2] Direct Install" echo "" @@ -145,21 +145,40 @@ install_rootfs_image(){ read junk if test -n "$junk" - then - echo -n "Use [$junk] as name? [Y|n] " - read junk2 - - case "$junk2" in - "Y"|"y"|"") rootfs_image_name="${junk}-rootfs.bin" - break ;; - *) echo "err ]$junk]";; - esac + then + if test -e "$1/boot-images/${junk}-rootfs.bin" + then + echo -e "\nFile [$1/boot-images/${junk}-rootfs.bin] already exists." + + while true + do + echo -n "Overwrite? [N|y] " + read junk2 + + case "$junk2" in + Y|y) break;; + n|N|"") install_rootfs_image "$1" + exit 0;; + esac + done + rootfs_image_name="${junk}-rootfs.bin" + break + else + echo -n "Use [$junk] as name? [Y|n] " + read junk2 + + case "$junk2" in + "Y"|"y"|"") rootfs_image_name="${junk}-rootfs.bin" + break ;; + *) echo "err ]$junk]";; + esac + fi fi done echo "" echo "Please enter the image size in MegaBytes" - echo "Must be at least 50Mb" + echo "Must be at least 30Mb" echo "" while true @@ -194,7 +213,7 @@ install_rootfs_image(){ echo "Please wait..." mkdir -p "$1/boot-images" - ! test -e "$1/boot-images/$rootfs_image_name" && dd if=/dev/zero of="$1/boot-images/$rootfs_image_name" bs=1024k count=$rootfs_image_size >/dev/null + dd if=/dev/zero of="$1/boot-images/$rootfs_image_name" bs=1024k count=$rootfs_image_size >/dev/null echo -n "Creating an ext2 filesystem on $rootfs_image_name..." losetup /dev/loop0 "$1/boot-images/$rootfs_image_name" || die "losetup /dev/loop0 \"$1/boot-images/$rootfs_image_name\" failed!" diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot index eb321ad456..2ba6f654b5 100644 --- a/packages/altboot/files/init.altboot +++ b/packages/altboot/files/init.altboot @@ -33,7 +33,11 @@ C_RESET="\033[0m" die() { echo "ERROR: $1" >/dev/tty0 - exec $SH_SHELL /dev/tty0 2>&1 + #exec $SH_SHELL /dev/tty0 2>&1 + + echo -e "\nPress to launch the altboot menu" + read junk + exec /sbin/init.altboot -force/dev/tty0 2>&1 } @@ -300,7 +304,7 @@ else # When started with -force, always print the menu - echo "$*" | grep -q "-force" && TIMEOUT=0 + echo "$*" | grep -q -- "-force" && TIMEOUT=0 # This timeout works by reading /proc/interrupts to see if the keyboard interrupt diff --git a/packages/altboot/files/spitz/altboot-2.4.cfg b/packages/altboot/files/spitz/altboot-2.4.cfg index 7a161b7a9c..3c8abc9bae 100644 --- a/packages/altboot/files/spitz/altboot-2.4.cfg +++ b/packages/altboot/files/spitz/altboot-2.4.cfg @@ -14,6 +14,7 @@ FSCK_IMAGES="yes" SD_DEVICE="/dev/mmcda1" SD_KERNEL_MODULE="/media/hdd/lib/modules/2.4.20/kernel/drivers/block/sharp_mmcsd_m.o" +USB_HOST_AVAILABLE="yes" USB_STORAGE_MODULES="usb_ohci_pxa27x usb-storage" USB_STORAGE_PARTITION="/dev/sda1" USB_STORAGE_WAIT="4" -- cgit v1.2.3 From d610bd848e19c84e3de9a38414a0cc9815903a3c Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sun, 12 Feb 2006 15:49:51 +0000 Subject: pvrusb2-mci: added release 20060209 --- packages/pvrusb2-mci/pvrusb2-mci_20060209.bb | 38 ++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 packages/pvrusb2-mci/pvrusb2-mci_20060209.bb diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb new file mode 100644 index 0000000000..b270be5337 --- /dev/null +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb @@ -0,0 +1,38 @@ +DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" +PRIORITY = "optional" +SECTION = "kernel/modules" +MAINTAINER = "eFfeM " +LICENSE = "GPL" +PR = "r0" +# It in fact requires these modules, but for now is using the local ones. +# RRECOMMEND = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115" +RRECOMMEND = "kernel-module-tda9887" + +SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2" + +S = "${WORKDIR}/pvrusb2-mci-${PV}" + +inherit module + +CFLAGS = "'-I${KERNEL_SOURCE}/include' \ + '-D__LINUX_ARM_ARCH__=5'" + +EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \ + 'CC=${KERNEL_CC}' \ + 'LD=${KERNEL_LD}' \ + 'KDIR=${STAGING_KERNEL_DIR}'" + +export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ + -rpath-link ${STAGING_DIR}/${TARGET_SYS}/lib" + + +do_compile() { + cd ivtv; oe_runmake + cd ../driver; oe_runmake +} + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media + install -m 0644 ivtv/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media + install -m 0644 driver/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media +} -- cgit v1.2.3 From bacabf230649fe09838575d2fb84424b7d07c16b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 12 Feb 2006 16:40:14 +0000 Subject: libmatchbox_svn: Correct PV field --- packages/libmatchbox/libmatchbox_svn.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/libmatchbox/libmatchbox_svn.bb b/packages/libmatchbox/libmatchbox_svn.bb index 9a49853fe1..90debcd87b 100644 --- a/packages/libmatchbox/libmatchbox_svn.bb +++ b/packages/libmatchbox/libmatchbox_svn.bb @@ -1,7 +1,6 @@ include libmatchbox.inc -#Remove the dash below when 1.7 changes in PV -PV = "1.7+cvs-${SRCDATE}" +PV = "1.7+svn${SRCDATE}" DEFAULT_PREFERENCE = "-1" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http\ -- cgit v1.2.3 From 01cb763fd34900f91513d18f75214547ee8c052f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 12 Feb 2006 16:42:28 +0000 Subject: gcc-cross 3.3.4: Use generic includes instead of repeating code (the code is equivalent but the .inc files contain fixes) --- packages/gcc/gcc-cross_3.3.4.bb | 97 +++-------------------------------------- 1 file changed, 5 insertions(+), 92 deletions(-) diff --git a/packages/gcc/gcc-cross_3.3.4.bb b/packages/gcc/gcc-cross_3.3.4.bb index b08112874a..597b47fba8 100644 --- a/packages/gcc/gcc-cross_3.3.4.bb +++ b/packages/gcc/gcc-cross_3.3.4.bb @@ -1,100 +1,13 @@ SECTION = "devel" include gcc_${PV}.bb +include gcc-paths-cross.inc inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" +PR="r3" + DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" -# Files for these are defined in the main gcc.oe -PACKAGES = "libgcc libstdc++ libg2c" -OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}" -INHIBIT_PACKAGE_STRIP = "1" - -EXTRA_OECONF_PATHS = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \ - --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++" - -export CPPFLAGS = "" -export CXXFLAGS = "" -export CFLAGS = "" -export LDFLAGS = "" - -do_configure () { - export CC="${BUILD_CC}" - export AR="${TARGET_SYS}-ar" - export RANLIB="${TARGET_SYS}-ranlib" - export LD="${TARGET_SYS}-ld" - export NM="${TARGET_SYS}-nm" - rm -f ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/${PV}/libgcc_eh.a - (cd ${S} && gnu-configize) || die "failure running gnu-configize" - oe_runconf -} - -do_compile_prepend () { - export CC="${BUILD_CC}" - export AR_FOR_TARGET="${TARGET_SYS}-ar" - export RANLIB_FOR_TARGET="${TARGET_SYS}-ranlib" - export LD_FOR_TARGET="${TARGET_SYS}-ld" - export NM_FOR_TARGET="${TARGET_SYS}-nm" - export CC_FOR_TARGET="${CCACHE} ${TARGET_SYS}-gcc" -} - -do_stage_append () { - for d in info man share/doc share/locale ; do - rm -rf ${CROSS_DIR}/$d - done - - # These aren't useful on the cross toolchain - rm -f ${CROSS_DIR}/bin/*gcov - rm -f ${CROSS_DIR}/bin/*gccbug - - # Fix a few include links so cross builds are happier - if [ ! -e ${STAGING_INCDIR}/c++ ]; then - mkdir -p ${STAGING_INCDIR} - rm -f ${STAGING_INCDIR}/c++ - ln -sf ${CROSS_DIR}/${TARGET_SYS}/include/c++ \ - ${STAGING_INCDIR}/ - fi - - # We use libiberty from binutils - rm -f ${CROSS_DIR}/lib/libiberty.a - - # We probably don't need these - rmdir ${CROSS_DIR}/include || : - - # We don't really need to keep this around - rm -rf ${CROSS_DIR}/share -} - -python do_package() { - if bb.data.getVar('DEBIAN_NAMES', d, 1): - bb.data.setVar('PKG_libgcc', 'libgcc1', d) - bb.build.exec_func('package_do_package', d) -} - -do_install () { - oe_runmake 'DESTDIR=${D}' install - - # Move libgcc_s into /lib - mkdir -p ${D}${base_libdir} - if [ "${BUILD_SYS}" == "${TARGET_SYS}" ]; then - # native builds drop one pathname component - mv -f ${D}${prefix}/lib/libgcc_s.so.* ${D}${base_libdir} - else - mv -f ${D}${prefix}/*/lib/libgcc_s.so.* ${D}${base_libdir} - fi - - # Move libstdc++ and libg2c into libdir (resetting our prefix to /usr - TGT_LIBDIR=`echo ${libdir} | sed -e 's,${CROSS_DIR},/usr,'` - mkdir -p ${D}${TGT_LIBDIR} - mv -f ${D}${prefix}/*/lib/libstdc++.so.* ${D}${TGT_LIBDIR} - mv -f ${D}${prefix}/*/lib/libg2c.so.* ${D}${TGT_LIBDIR} - - # Manually run the target stripper since we won't get it run by - # the packaging. - if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then - ${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libstdc++.so.* - ${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libg2c.so.* - ${TARGET_PREFIX}strip ${D}${base_libdir}/libgcc_s.so.* - fi -} +include gcc3-build-cross.inc +include gcc-package-cross.inc \ No newline at end of file -- cgit v1.2.3 From 5ccab5996d7b13820da0ccc083d7ece02823843c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 12 Feb 2006 16:43:40 +0000 Subject: galago-deamon 0.3.4: Package a missing file --- packages/galago/galago-daemon_0.3.4.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/galago/galago-daemon_0.3.4.bb b/packages/galago/galago-daemon_0.3.4.bb index 610b9f7128..22257b6f44 100644 --- a/packages/galago/galago-daemon_0.3.4.bb +++ b/packages/galago/galago-daemon_0.3.4.bb @@ -3,11 +3,13 @@ HOMEPAGE = "http://www.galago-project.org/" MAINTAINER = "Koen Kooi " LICENSE = "GPL" DEPENDS = "gettext libgalago dbus glib-2.0" - +PR = "r1" SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz \ file://no-check.patch;patch=1" EXTRA_OECONF = "--disable-binreloc" +FILES_${PN} += "${datadir}/dbus-1/services/" + inherit autotools pkgconfig -- cgit v1.2.3 From da5104b2b41addc813d27c276148a983b6a3ac1c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 12 Feb 2006 16:48:03 +0000 Subject: eds-dbus: Correct RDEPENDS and PV --- packages/eds/eds-dbus_svn.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/eds/eds-dbus_svn.bb b/packages/eds/eds-dbus_svn.bb index 3337970fee..1b427604a8 100644 --- a/packages/eds/eds-dbus_svn.bb +++ b/packages/eds/eds-dbus_svn.bb @@ -1,9 +1,9 @@ LICENSE = "LGPL" DEPENDS = "glib-2.0 gtk+ gconf dbus db gnome-common libglade libiconv" -RDEPENDS = "gconf dbus-1 db libiconv" +RDEPENDS = "gconf dbus db libiconv" MAINTAINER = "Richard Purdie " DESCRIPTION = "Evolution database backend server" -PV = "1.4.0+cvs${SRCDATE}" +PV = "1.4.0+svn${SRCDATE}" PR = "r14" SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \ -- cgit v1.2.3 From 3ed0c7bea462dd9776402fd5a31c5f50af455b23 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 12 Feb 2006 17:02:26 +0000 Subject: preferred_gpe_versions 2.6/2.7: Correct some strings to match PV's that changed and to reflect issues that were fixed in bitbake --- conf/distro/preferred-gpe-versions-2.6.inc | 2 +- conf/distro/preferred-gpe-versions-2.7.inc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/distro/preferred-gpe-versions-2.6.inc b/conf/distro/preferred-gpe-versions-2.6.inc index d4422e86e9..1d09ae6051 100644 --- a/conf/distro/preferred-gpe-versions-2.6.inc +++ b/conf/distro/preferred-gpe-versions-2.6.inc @@ -79,7 +79,7 @@ PREFERRED_VERSION_xdemineur ?= "2.1.1" PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1" PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_dillo2 ?= "0.6.6" -PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE_minimo}" +PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1" PREFERRED_VERSION_linphone ?= "0.12.2" PREFERRED_VERSION_firefox ?= "1.0" diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc index ea0ab62610..933195977d 100644 --- a/conf/distro/preferred-gpe-versions-2.7.inc +++ b/conf/distro/preferred-gpe-versions-2.7.inc @@ -14,7 +14,7 @@ PREFERRED_VERSION_libmatchbox ?= "1.7" PREFERRED_VERSION_matchbox ?= "0.9.1" PREFERRED_VERSION_matchbox-common ?= "0.9.1" PREFERRED_VERSION_matchbox-desktop ?= "0.9.1" -PREFERRED_VERSION_matchbox-wm ?= "0.9.5+cvs${SRCDATE}" +PREFERRED_VERSION_matchbox-wm ?= "0.9.5+svn${SRCDATE}" PREFERRED_VERSION_matchbox-panel ?= "0.9.2" PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6" PREFERRED_VERSION_atk ?= "1.9.0" @@ -86,7 +86,7 @@ PREFERRED_VERSION_xdemineur ?= "2.1.1" PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1" PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_dillo2 ?= "0.6.6" -PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE_minimo}" +PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1" PREFERRED_VERSION_linphone ?= "0.12.2" PREFERRED_VERSION_firefox ?= "1.0" -- cgit v1.2.3 From 6447cb4e3d2a818ca2bdf1adcc269fdae5302fde Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 12 Feb 2006 17:04:47 +0000 Subject: fontconfig: Fix handling of fontconfig-utils properly, once and for all --- packages/fontconfig/fontconfig_2.2.95.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/fontconfig/fontconfig_2.2.95.bb b/packages/fontconfig/fontconfig_2.2.95.bb index ecf871504b..5fdf825fc5 100644 --- a/packages/fontconfig/fontconfig_2.2.95.bb +++ b/packages/fontconfig/fontconfig_2.2.95.bb @@ -6,14 +6,14 @@ DEPENDS = "expat freetype freetype-native zlib fontconfig-native" SRC_URI = "http://pdx.freedesktop.org/fontconfig/release/fontconfig-${PV}.tar.gz \ file://fc-glyphname.patch;patch=1 \ file://fc-lang.patch;patch=1" -PR = "r4" +PR = "r5" PACKAGES =+ "fontconfig-utils" FILES_fontconfig-utils = "${bindir}/*" -# Hacks to work around broken debian.bbclass -RPROVIDES = "libfontconfig-utils" -PKG_fontconfig-utils = "fontconfig-utils" +# Work around past breakage in debian.bbclass +RPROVIDES_fontconfig-utils = "libfontconfig-utils" +DEBIAN_NOAUTONAME_fontconfig-utils = "1" S = "${WORKDIR}/fontconfig-${PV}" -- cgit v1.2.3 From ef7b99ecfed9f4a3f5064bc0c945dda789e1a7d6 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 12 Feb 2006 17:10:46 +0000 Subject: Add DEBIAN_NOAUTONAME_ variable to disable debian.bbclass renaming for specific packages. --- classes/debian.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/debian.bbclass b/classes/debian.bbclass index d66c1fc763..63a126ca17 100644 --- a/classes/debian.bbclass +++ b/classes/debian.bbclass @@ -74,7 +74,7 @@ python debian_package_name_hook () { if soname_result: (pkgname, devname) = soname_result for pkg in packages.split(): - if (bb.data.getVar('PKG_' + pkg, d)): + if (bb.data.getVar('PKG_' + pkg, d) or bb.data.getVar('DEBIAN_NOAUTONAME_' + pkg, d)): continue if pkg == orig_pkg: newpkg = pkgname -- cgit v1.2.3 From 862c6130a58a6c87c69d2d937e66f434b9b001e0 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 12 Feb 2006 18:36:36 +0000 Subject: Fix package name renaming for classes like debian.bbclass: package.bbclass now tracks any package renaming performed using PKG_*. When a package is built, the runtime variables are translated using this cached information which is stored in staging. From now on, only use package names are valid in runtime variables like RDEPENDS, RRECOMMENDS and RSUGGESTS. eg. fontconfig-dev is correct, libfontconfig-dev would be wrong. As debian.bbclass can't determine package renaming until after a package's contents is known, the class has to set BUILD_ALL_DEPS = "1". This also means OE is no longer forced into one package renaming scheme. --- classes/debian.bbclass | 8 +++++ classes/package.bbclass | 74 +++++++++++++++++++++++++++++++++++++++++++-- classes/package_ipk.bbclass | 3 ++ 3 files changed, 83 insertions(+), 2 deletions(-) diff --git a/classes/debian.bbclass b/classes/debian.bbclass index 63a126ca17..5688dad93b 100644 --- a/classes/debian.bbclass +++ b/classes/debian.bbclass @@ -1,3 +1,11 @@ +STAGING_PKGMAPS_DIR = "${STAGING_DIR}/pkgmaps/debian" + +# Debain package renaming only occurs when a package is built +# We therefore have to make sure we build all runtime packages +# before building the current package to make the packages runtime +# depends are correct +BUILD_ALL_DEPS = "1" + python debian_package_name_hook () { import glob, copy, stat, errno, re diff --git a/classes/package.bbclass b/classes/package.bbclass index fd8d1b7b09..ab1cea37c0 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -1,6 +1,73 @@ def legitimize_package_name(s): return s.lower().replace('_', '-').replace('@', '+').replace(',', '+').replace('/', '-') +STAGING_PKGMAPS_DIR ?= "${STAGING_DIR}/pkgmaps" + +def add_package_mapping (pkg, new_name, d): + import bb, os + + def encode(str): + import codecs + c = codecs.getencoder("string_escape") + return c(str)[0] + + pmap_dir = bb.data.getVar('STAGING_PKGMAPS_DIR', d, 1) + + bb.mkdirhier(pmap_dir) + + data_file = os.path.join(pmap_dir, pkg) + + f = open(data_file, 'w') + f.write("%s\n" % encode(new_name)) + f.close() + +def get_package_mapping (pkg, d): + import bb, os + + def decode(str): + import codecs + c = codecs.getdecoder("string_escape") + return c(str)[0] + + data_file = bb.data.expand("${STAGING_PKGMAPS_DIR}/%s" % pkg, d) + + if os.access(data_file, os.R_OK): + f = file(data_file, 'r') + lines = f.readlines() + f.close() + for l in lines: + return decode(l).strip() + return pkg + +def runtime_mapping_rename (varname, d): + import bb, os + + #bb.note("%s before: %s" % (varname, bb.data.getVar(varname, d, 1))) + + new_depends = [] + for depend in explode_deps(bb.data.getVar(varname, d, 1) or ""): + # Have to be careful with any version component of the depend + split_depend = depend.split(' (') + new_depend = get_package_mapping(split_depend[0].strip(), d) + if len(split_depend) > 1: + new_depends.append("%s (%s" % (new_depend, split_depend[1])) + else: + new_depends.append(new_depend) + + bb.data.setVar(varname, " ".join(new_depends) or None, d) + + #bb.note("%s after: %s" % (varname, bb.data.getVar(varname, d, 1))) + +python package_mapping_rename_hook () { + runtime_mapping_rename("RDEPENDS", d) + runtime_mapping_rename("RRECOMMENDS", d) + runtime_mapping_rename("RSUGGESTS", d) + runtime_mapping_rename("RPROVIDES", d) + runtime_mapping_rename("RREPLACES", d) + runtime_mapping_rename("RCONFLICTS", d) +} + + def do_split_packages(d, root, file_regex, output_pattern, description, postinst=None, recursive=False, hook=None, extra_depends=None, aux_files_pattern=None, postrm=None, allow_dirs=False, prepend=False, match_path=False): import os, os.path, bb @@ -240,8 +307,11 @@ python populate_packages () { bb.build.exec_func("package_name_hook", d) for pkg in packages.split(): - if bb.data.getVar('PKG_%s' % pkg, d, 1) is None: + pkgname = bb.data.getVar('PKG_%s' % pkg, d, 1) + if pkgname is None: bb.data.setVar('PKG_%s' % pkg, pkg, d) + else: + add_package_mapping(pkg, pkgname, d) dangling_links = {} pkg_files = {} @@ -641,5 +711,5 @@ python package_do_package () { do_package[dirs] = "${D}" populate_packages[dirs] = "${D}" -EXPORT_FUNCTIONS do_package do_shlibs do_split_locales +EXPORT_FUNCTIONS do_package do_shlibs do_split_locales mapping_rename_hook addtask package before do_build after do_populate_staging diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index a70b1e8cdd..9ae526bb3b 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -165,6 +165,9 @@ python do_package_ipk () { ctrlfile.close() raise bb.build.FuncFailed("Missing field for ipk generation: %s" % value) # more fields + + bb.build.exec_func("mapping_rename_hook", localdata) + rdepends = explode_deps(bb.data.getVar("RDEPENDS", localdata, 1) or "") rrecommends = explode_deps(bb.data.getVar("RRECOMMENDS", localdata, 1) or "") rsuggests = (bb.data.getVar("RSUGGESTS", localdata, 1) or "").split() -- cgit v1.2.3 From d5d57e4f3efb894ef45120981a2de17993d4a2b7 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 12 Feb 2006 18:59:46 +0000 Subject: python 2.4.2: fix dependencies for python-re and python-stringold --- packages/python/python-2.4.2-manifest.inc | 10 +++++----- packages/python/python_2.4.2.bb | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/python/python-2.4.2-manifest.inc b/packages/python/python-2.4.2-manifest.inc index 5020070667..6d3696b754 100644 --- a/packages/python/python-2.4.2-manifest.inc +++ b/packages/python/python-2.4.2-manifest.inc @@ -1,5 +1,5 @@ ######################################################################################################################## -### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer ] on Mon Oct 10 14:45:24 2005 +### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer ] on Sun Feb 12 19:58:10 2006 ### ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy ### @@ -61,8 +61,8 @@ RDEPENDS_python-compression="python-core python-zlib" FILES_python-compression="${libdir}/python2.4/gzip.* ${libdir}/python2.4/zipfile.* " DESCRIPTION_python-re="Python Regular Expression APIs" -PR_python-re="ml1" -RDEPENDS_python-re="python-core python-stringold" +PR_python-re="ml2" +RDEPENDS_python-re="python-core" FILES_python-re="${libdir}/python2.4/re.* ${libdir}/python2.4/sre.* ${libdir}/python2.4/sre_compile.* ${libdir}/python2.4/sre_constants* ${libdir}/python2.4/sre_parse.* " DESCRIPTION_python-xmlrpc="Python XMLRPC Support" @@ -191,8 +191,8 @@ RDEPENDS_python-unittest="python-core python-stringold python-lang" FILES_python-unittest="${libdir}/python2.4/unittest.* " DESCRIPTION_python-stringold="Python Deprecated String APIs" -PR_python-stringold="ml1" -RDEPENDS_python-stringold="python-core" +PR_python-stringold="ml2" +RDEPENDS_python-stringold="python-core python-re" FILES_python-stringold="${libdir}/python2.4/lib-dynload/strop.so ${libdir}/python2.4/string.* " DESCRIPTION_python-lib-old-and-deprecated="Python Deprecated Libraries" diff --git a/packages/python/python_2.4.2.bb b/packages/python/python_2.4.2.bb index aad93d0d59..3e2ef849fd 100644 --- a/packages/python/python_2.4.2.bb +++ b/packages/python/python_2.4.2.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " PROVIDES = "python python-core" DEPENDS = "python-native readline zlib gdbm openssl tcl tk" -PR = "ml2" +PR = "ml3" PYTHON_MAJMIN = "2.4" -- cgit v1.2.3 From 8f7d24559543565f314077459f5031c0d34d9220 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Sun, 12 Feb 2006 19:01:04 +0000 Subject: gpe-bootsplash: - Display a message informing the user that he can chvt 1 to see the boot-messages - Do a chvt 1 if gpe-bootsplash errors out --- packages/gpe-bootsplash/files/tty2-message.patch | 19 +++++++++++++++++++ packages/gpe-bootsplash/gpe-bootsplash_1.15.bb | 6 ++++-- 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 packages/gpe-bootsplash/files/tty2-message.patch diff --git a/packages/gpe-bootsplash/files/tty2-message.patch b/packages/gpe-bootsplash/files/tty2-message.patch new file mode 100644 index 0000000000..0c3b2d859b --- /dev/null +++ b/packages/gpe-bootsplash/files/tty2-message.patch @@ -0,0 +1,19 @@ +--- gpe-bootsplash-1.15/gpe-bootsplash.init.orig 2006-02-12 19:36:10.600838563 +0100 ++++ gpe-bootsplash-1.15/gpe-bootsplash.init 2006-02-12 19:36:13.957218949 +0100 +@@ -31,8 +31,15 @@ + ;; + esac + echo "0" > /proc/sys/kernel/printk ++ ++ # Clear tty2 ++ echo -e "\033c" > /dev/tty2 + chvt 2 +- /usr/bin/gpe-bootsplash $ARGS ++ ++ echo -e "\nLoading bootsplash..." > /dev/tty2 ++ echo "Use Fn-LeftArrow to see the boot messages." > /dev/tty2 ++ ++ /usr/bin/gpe-bootsplash $ARGS || chvt 1 + ;; + 'stop') + ;; diff --git a/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb b/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb index 1e25bfd1ab..fd17846103 100644 --- a/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb +++ b/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb @@ -5,9 +5,11 @@ MAINTAINER = "Phil Blundell " SECTION = "gpe" PRIORITY = "optional" LICENSE = "GPL" -PR = "r1" +PR = "r2" -SRC_URI += "file://splash-p.svg file://splash-l.svg" +SRC_URI += "file://splash-p.svg \ + file://splash-l.svg \ + file://tty2-message.patch;patch=1" FILES_${PN} += "${datadir}/gpe" -- cgit v1.2.3 From 2e1c29f22ce2c7815a0b129712908706ea1f1140 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 12 Feb 2006 19:03:27 +0000 Subject: conf/bitbake.conf: - Add GENTOO_MIRROR packages/pax-utils: - Add version 0.1.9 of the pax utilities including scanelf. I will use it in a dedicated QA bbclass to check for common security issues. --- conf/bitbake.conf | 1 + packages/pax-utils/.mtn2git_empty | 0 packages/pax-utils/pax-utils-native_0.1.9.bb | 7 +++++++ packages/pax-utils/pax-utils_0.1.9.bb | 16 ++++++++++++++++ 4 files changed, 24 insertions(+) create mode 100644 packages/pax-utils/.mtn2git_empty create mode 100644 packages/pax-utils/pax-utils-native_0.1.9.bb create mode 100644 packages/pax-utils/pax-utils_0.1.9.bb diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 89ab4ff924..c28e3a7e22 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -304,6 +304,7 @@ XORG_MIRROR = "http://xorg.freedesktop.org/releases" GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources" FREEBSD_MIRROR = "ftp://ftp.freebsd.org/pub/FreeBSD/" HANDHELDS_CVS = "cvs://anoncvs:anoncvs@anoncvs.handhelds.org/cvs" +GENTOO_MIRROR = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles" # You can use the mirror of your country to get faster downloads by putting # export DEBIAN_MIRROR = "ftp://ftp.de.debian.org/debian/pool" diff --git a/packages/pax-utils/.mtn2git_empty b/packages/pax-utils/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/pax-utils/pax-utils-native_0.1.9.bb b/packages/pax-utils/pax-utils-native_0.1.9.bb new file mode 100644 index 0000000000..d586dcb29e --- /dev/null +++ b/packages/pax-utils/pax-utils-native_0.1.9.bb @@ -0,0 +1,7 @@ +inherit native + +require pax-utils_${PV}.bb + +do_stage() { + oe_runmake PREFIX=${STAGING_DIR}/${HOST_SYS} install +} diff --git a/packages/pax-utils/pax-utils_0.1.9.bb b/packages/pax-utils/pax-utils_0.1.9.bb new file mode 100644 index 0000000000..3aa6b22ee8 --- /dev/null +++ b/packages/pax-utils/pax-utils_0.1.9.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Various ELF utilities" +HOMEPAGE = "http://www.gentoo.org/proj/en/hardened/pax-utils.xml" +LICENSE = "GPLv2" +MAINTAINER = "freyther@handhelds.org" + +SRC_URI = "${GENTOO_MIRROR}/pax-utils-${PV}.tar.bz2;md5sum=71e8d13d072efcbc4123960211a34d4f" +S = "${WORKDIR}/pax-utils-${PV}" + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake DESTDIR=${D} install +} + -- cgit v1.2.3 From fc0df0a1a9a33310586749f88d01de55a6918862 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Sun, 12 Feb 2006 19:21:58 +0000 Subject: added macchanger 1.5.0 - close #673 --- packages/macchanger/.mtn2git_empty | 0 packages/macchanger/macchanger_1.5.0.bb | 10 ++++++++++ 2 files changed, 10 insertions(+) create mode 100644 packages/macchanger/.mtn2git_empty create mode 100644 packages/macchanger/macchanger_1.5.0.bb diff --git a/packages/macchanger/.mtn2git_empty b/packages/macchanger/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/macchanger/macchanger_1.5.0.bb b/packages/macchanger/macchanger_1.5.0.bb new file mode 100644 index 0000000000..6f85a90098 --- /dev/null +++ b/packages/macchanger/macchanger_1.5.0.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "A GNU/Linux utility for viewing/manipulating the MAC address of network interfaces" +HOMEPAGE = "http://www.alobbs.com/modules.php?op=modload&name=macc&file=index" +MAINTAINER = "Nigel Kostiuck " +LICENSE = "GPL" +SECTION = "net" +PRIORITY = "optional" + +SRC_URI = "ftp://ftp.gnu.org/gnu/macchanger/macchanger-${PV}.tar.gz" + +inherit autotools -- cgit v1.2.3 From 5412618c5e867a36e9bc59a9b77a9aa890c3e29b Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Sun, 12 Feb 2006 20:01:13 +0000 Subject: module-init-tools: change depmod removal - close #671 - "update-alternative --remove depmod" moved to m-i-t-depmod prerm - removed handling of depmod from m-i-t as it is handled in m-i-t-depmod already and user can have only depmod package installed --- packages/module-init-tools/module-init-tools_3.2.2.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/module-init-tools/module-init-tools_3.2.2.bb b/packages/module-init-tools/module-init-tools_3.2.2.bb index bbd8cca1bf..b0d2f34e5e 100644 --- a/packages/module-init-tools/module-init-tools_3.2.2.bb +++ b/packages/module-init-tools/module-init-tools_3.2.2.bb @@ -3,7 +3,7 @@ removing kernel modules for Linux (versions 2.5.48 and above). It serves \ the same function that the modutils package serves for Linux 2.4." LICENSE = "GPL" SECTION = "base" -PR = "r0" +PR = "r1" PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" RDEPENDS_${PN} += "module-init-tools-depmod" @@ -34,7 +34,7 @@ do_install() { pkg_postinst_module-init-tools() { #!/bin/sh -for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo; do +for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/modinfo; do bn=`basename $f` update-alternatives --install /$f $bn /$f.26 60 done @@ -44,7 +44,7 @@ update-alternatives --install /sbin/lsmod lsmod /bin/lsmod.26 60 pkg_prerm_module-init-tools() { #!/bin/sh -for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo; do +for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/modinfo; do bn=`basename $f` update-alternatives --remove $bn /$f.26 done @@ -57,7 +57,7 @@ pkg_postinst_module-init-tools-depmod() { update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 60 } -pkg_prerm_module-init-tools() { +pkg_prerm_module-init-tools-depmod() { #!/bin/sh update-alternatives --remove depmod /sbin/depmod.26 } -- cgit v1.2.3 From e916c45ab468cc9e7852bee0a6a06253343d0970 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 12 Feb 2006 20:37:04 +0000 Subject: org.openembedded.dev/classes/insane.bbclass: -Add the skeleton for the QA bbclass --- classes/insane.bbclass | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 classes/insane.bbclass diff --git a/classes/insane.bbclass b/classes/insane.bbclass new file mode 100644 index 0000000000..067fa64dff --- /dev/null +++ b/classes/insane.bbclass @@ -0,0 +1,32 @@ +# +# BB Class inspired by ebuild.sh +# +# As I will be copying code from from ebuild.sh this is +# Copyright Gentoo Foundation 1999-2006 +# GPLv2 +# +# This class will test files after installation for certain +# security issues and other kind of issues. +# +# Checks we do: +# -Check the ownership and permissions +# -Check the RUNTIME path for the $TMPDIR +# +# Checks that are planned: +# -Check installed and stages .la files + + +# +# We need to have the scanelf utility as soon as +# possible. +# +DEPENDS_prepend = " pax-utilities-native " + +# We play a special package function +inherit packages + + +PACKAGEFUNCS += "do_package_qa" + +python do_package_qa () { +} -- cgit v1.2.3 From 484abdf495a9061e584691d93708078d6d0ef8f2 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Sun, 12 Feb 2006 20:46:53 +0000 Subject: gpe-bootsplash: Add an opie-theme --- packages/gpe-bootsplash/files/opie-logo.png | Bin 0 -> 9216 bytes .../gpe-bootsplash/files/splash-opie-landscape.svg | 229 +++++++++++ .../gpe-bootsplash/files/splash-opie-portrait.svg | 456 +++++++++++++++++++++ .../gpe-bootsplash/gpe-bootsplash-theme-opie.bb | 35 ++ 4 files changed, 720 insertions(+) create mode 100644 packages/gpe-bootsplash/files/opie-logo.png create mode 100644 packages/gpe-bootsplash/files/splash-opie-landscape.svg create mode 100644 packages/gpe-bootsplash/files/splash-opie-portrait.svg create mode 100644 packages/gpe-bootsplash/gpe-bootsplash-theme-opie.bb diff --git a/packages/gpe-bootsplash/files/opie-logo.png b/packages/gpe-bootsplash/files/opie-logo.png new file mode 100644 index 0000000000..870f726355 Binary files /dev/null and b/packages/gpe-bootsplash/files/opie-logo.png differ diff --git a/packages/gpe-bootsplash/files/splash-opie-landscape.svg b/packages/gpe-bootsplash/files/splash-opie-landscape.svg new file mode 100644 index 0000000000..8bf352396a --- /dev/null +++ b/packages/gpe-bootsplash/files/splash-opie-landscape.svg @@ -0,0 +1,229 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/gpe-bootsplash/files/splash-opie-portrait.svg b/packages/gpe-bootsplash/files/splash-opie-portrait.svg new file mode 100644 index 0000000000..4bcb9d2f5f --- /dev/null +++ b/packages/gpe-bootsplash/files/splash-opie-portrait.svg @@ -0,0 +1,456 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/gpe-bootsplash/gpe-bootsplash-theme-opie.bb b/packages/gpe-bootsplash/gpe-bootsplash-theme-opie.bb new file mode 100644 index 0000000000..dff92e75c3 --- /dev/null +++ b/packages/gpe-bootsplash/gpe-bootsplash-theme-opie.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "An Enlightenment theme for gpe-bootsplash" +SECTION = "base" +PRIORITY = "optional" +MAINTAINER = "Matthias 'CoreDump' Hentges " +LICENSE = "GPL" + +DEPENDS = "gpe-bootsplash" +RDEPENDS = "gpe-bootsplash" + +PR = "r0" + +export THEME = "opie" + +SRC_URI = "file://*.svg \ + file://*${THEME}*logo*" + +FILES_${PN} = "/usr/share/gpe/splash-${THEME}-*\ + /usr/share/gpe/${THEME}-logo.png" + + +do_install(){ + install -d "${D}/usr/share/gpe" + install -m 0644 ${WORKDIR}/splash-${THEME}* ${D}/usr/share/gpe + install -m 0644 ${WORKDIR}/${THEME}-logo.png ${D}/usr/share/gpe +} + +pkg_postinst() { + update-alternatives --install /usr/share/gpe/splash-l.svg bootsplash-l /usr/share/gpe/splash-${THEME}-landscape.svg 20 + update-alternatives --install /usr/share/gpe/splash-p.svg bootsplash-p /usr/share/gpe/splash-${THEME}-portrait.svg 20 +} + +pkg_postrm() { + update-alternatives --remove bootsplash-l /usr/share/gpe/splash-${THEME}-landscape.svg + update-alternatives --remove bootsplash-p /usr/share/gpe/splash-${THEME}-portrait.svg +} -- cgit v1.2.3 From 610b038887abe64e94fbc8b30ab0cc46cc94b595 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Sun, 12 Feb 2006 23:03:24 +0000 Subject: xmonobut_0.4.1: add missing DEPENDS on libmatchbox --- packages/xmonobut/xmonobut_0.4.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/xmonobut/xmonobut_0.4.1.bb b/packages/xmonobut/xmonobut_0.4.1.bb index 4c60d4b9c2..dcbf5c56ca 100644 --- a/packages/xmonobut/xmonobut_0.4.1.bb +++ b/packages/xmonobut/xmonobut_0.4.1.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" PR = "r1" DESCRIPTION = "utility to allow middle and right clicking with a stylus" SECTION = "x11/utils" -DEPENDS = "diet-x11 xext xpm" +DEPENDS = "diet-x11 xext xpm libmatchbox" SRC_URI = "http://www.handhelds.org/~philippe/sources/xmonobut-${PV}.tar.gz \ file://xmonobut.desktop" inherit autotools -- cgit v1.2.3 From 70774a74a42e8c657b73f375e3273ad7be7681f1 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 13 Feb 2006 00:49:32 +0000 Subject: expat: Add 2.0.0 thanks to Eric Shattow (shadows) (#672) --- packages/expat/expat-2.0.0/.mtn2git_empty | 0 packages/expat/expat-2.0.0/autotools.patch | 13 ++++++++++++ packages/expat/expat_2.0.0.bb | 32 ++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 packages/expat/expat-2.0.0/.mtn2git_empty create mode 100644 packages/expat/expat-2.0.0/autotools.patch create mode 100644 packages/expat/expat_2.0.0.bb diff --git a/packages/expat/expat-2.0.0/.mtn2git_empty b/packages/expat/expat-2.0.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/expat/expat-2.0.0/autotools.patch b/packages/expat/expat-2.0.0/autotools.patch new file mode 100644 index 0000000000..77aee3a833 --- /dev/null +++ b/packages/expat/expat-2.0.0/autotools.patch @@ -0,0 +1,13 @@ +diff -bur expat-2.0.0~orig/configure.in expat-2.0.0/configure.in +--- expat-2.0.0~orig/configure.in 2006-01-10 19:10:46.000000000 -0600 ++++ expat-2.0.0/configure.in 2006-02-10 19:12:24.000000000 -0600 +@@ -50,9 +50,6 @@ + + AC_CONFIG_HEADER(expat_config.h) + +-sinclude(conftools/libtool.m4) +-sinclude(conftools/ac_c_bigendian_cross.m4) +- + AC_LIBTOOL_WIN32_DLL + AC_PROG_LIBTOOL + diff --git a/packages/expat/expat_2.0.0.bb b/packages/expat/expat_2.0.0.bb new file mode 100644 index 0000000000..b3bbe54b02 --- /dev/null +++ b/packages/expat/expat_2.0.0.bb @@ -0,0 +1,32 @@ +SECTION = "libs" +DESCRIPTION = "Jim Clarkes XML parser library." +HOMEPAGE = "http://expat.sourceforge.net/" +LICENSE = "MIT" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \ + file://autotools.patch;patch=1" +S = "${WORKDIR}/expat-${PV}" + +inherit autotools lib_package +export LTCC = "${CC}" + +do_configure () { + rm -f ${S}/conftools/libtool.m4 + autotools_do_configure +} + +do_stage () { + install -m 0644 ${S}/lib/expat.h ${STAGING_INCDIR}/ + install -m 0644 ${S}/lib/expat_external.h ${STAGING_INCDIR}/ + oe_libinstall -so libexpat ${STAGING_LIBDIR} +} + +do_install () { + oe_runmake prefix="${D}${prefix}" \ + bindir="${D}${bindir}" \ + libdir="${D}${libdir}" \ + includedir="${D}${includedir}" \ + man1dir="${D}${mandir}/man1" \ + install +} -- cgit v1.2.3 From 56901f00366e56b1a25b0d2d02f8a8fbc6e2b87e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 13 Feb 2006 00:51:38 +0000 Subject: libsvg: Add 0.1.4 thanks to Eric Shattow (shadows) (#675) --- packages/cairo/libsvg-0.1.4/.mtn2git_empty | 0 packages/cairo/libsvg-0.1.4/gcc4_and_expat.patch | 19 +++++++++++++++++++ packages/cairo/libsvg_0.1.4.bb | 17 +++++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 packages/cairo/libsvg-0.1.4/.mtn2git_empty create mode 100644 packages/cairo/libsvg-0.1.4/gcc4_and_expat.patch create mode 100644 packages/cairo/libsvg_0.1.4.bb diff --git a/packages/cairo/libsvg-0.1.4/.mtn2git_empty b/packages/cairo/libsvg-0.1.4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/cairo/libsvg-0.1.4/gcc4_and_expat.patch b/packages/cairo/libsvg-0.1.4/gcc4_and_expat.patch new file mode 100644 index 0000000000..feec4ab74d --- /dev/null +++ b/packages/cairo/libsvg-0.1.4/gcc4_and_expat.patch @@ -0,0 +1,19 @@ +diff -bur libsvg-0.1.4~orig/src/svg_parser_expat.c libsvg-0.1.4/src/svg_parser_expat.c +--- libsvg-0.1.4~orig/src/svg_parser_expat.c 2005-02-14 11:26:26.000000000 -0600 ++++ libsvg-0.1.4/src/svg_parser_expat.c 2006-02-10 21:58:20.000000000 -0600 +@@ -30,6 +30,7 @@ + #include "svgint.h" + #include "svg_hash.h" + ++#ifndef LIBSVG_EXPAT + static void + _svg_parser_sax_start_element (void *closure, + const XML_Char *name, +@@ -43,6 +44,7 @@ + _svg_parser_sax_characters (void *closure, + const XML_Char *ch, + int len); ++#endif + + static void + _svg_parser_sax_warning (void *closure, diff --git a/packages/cairo/libsvg_0.1.4.bb b/packages/cairo/libsvg_0.1.4.bb new file mode 100644 index 0000000000..77d86c7674 --- /dev/null +++ b/packages/cairo/libsvg_0.1.4.bb @@ -0,0 +1,17 @@ +SECTION = "libs" +LICENSE = "LGPL" +PRIORITY = "optional" +DEPENDS = "expat jpeg zlib libpng" +DESCRIPTION = "SVG parser library" +PR = "r0" + +SRC_URI = "http://cairographics.org/snapshots/libsvg-${PV}.tar.gz \ + file://gcc4_and_expat.patch;patch=1" + +EXTRA_OECONF = "--with-expat" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all() +} -- cgit v1.2.3 From 52085c92788114b79a9957aae5136c7c3d8ba8f3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 13 Feb 2006 00:55:11 +0000 Subject: dpkg: Add 1.13.11 --- packages/dpkg/dpkg-1.13.11/.mtn2git_empty | 0 packages/dpkg/dpkg-1.13.11/autofoo.patch | 48 +++++++++++++++++++++++++++++++ packages/dpkg/dpkg_1.13.11.bb | 11 +++++++ 3 files changed, 59 insertions(+) create mode 100644 packages/dpkg/dpkg-1.13.11/.mtn2git_empty create mode 100644 packages/dpkg/dpkg-1.13.11/autofoo.patch create mode 100644 packages/dpkg/dpkg_1.13.11.bb diff --git a/packages/dpkg/dpkg-1.13.11/.mtn2git_empty b/packages/dpkg/dpkg-1.13.11/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/dpkg/dpkg-1.13.11/autofoo.patch b/packages/dpkg/dpkg-1.13.11/autofoo.patch new file mode 100644 index 0000000000..691121e418 --- /dev/null +++ b/packages/dpkg/dpkg-1.13.11/autofoo.patch @@ -0,0 +1,48 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- dpkg-1.10.23/configure.in~autofoo ++++ dpkg-1.10.23/configure.in +@@ -227,21 +227,36 @@ + # OpenBSD passes AC_TRY_COMPILE for va_copy even though + # it doesn't seem to exist, which is odd. We need to use + # AC_TRY_RUN. ++# ++# If crosscompiling, use AC_TRY_COMPILE. -CL + AC_TRY_RUN([ + #include + main(){ + va_list v1,v2; + va_copy(v1, v2); + exit(0);} +-], [AC_MSG_RESULT(yes) +-AC_DEFINE(HAVE_VA_COPY,,[Whether the va_copy macro exists])],[AC_MSG_RESULT(no) +-AC_MSG_CHECKING([for va_list assignment copy]) ++], [dpkg_cv_va_copy=yes], [dpkg_cv_va_copy=no], + AC_TRY_COMPILE([ + #include ++main(){ ++va_list v1,v2; ++va_copy(v1, v2); ++exit(0);} ++], [dpkg_cv_va_copy=yes], [dpkg_vc_va_copy=no])) ++ ++if test "$dpkg_cv_va_copy" = "yes"; then ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_VA_COPY,,[Whether the va_copy macro exists]) ++else ++ AC_MSG_RESULT(no) ++ AC_MSG_CHECKING([for va_list assignment copy]) ++ AC_TRY_COMPILE([ ++#include + ],[ + va_list v1,v2; + v1 = v2; +-], AC_MSG_RESULT(yes),AC_MSG_ERROR(no))]) ++], AC_MSG_RESULT(yes), AC_MSG_ERROR(no)) ++fi + + DPKG_C_GCC_ATTRIBUTE([,,],supported,[int x],[,,],ATTRIB,[Define if function attributes a la GCC 2.5 and higher are available.], + DPKG_C_GCC_ATTRIBUTE(noreturn,noreturn,[int x],noreturn,NORETURN,[Define if nonreturning functions a la GCC 2.5 and higher are available.]) diff --git a/packages/dpkg/dpkg_1.13.11.bb b/packages/dpkg/dpkg_1.13.11.bb new file mode 100644 index 0000000000..c6ce0c9e66 --- /dev/null +++ b/packages/dpkg/dpkg_1.13.11.bb @@ -0,0 +1,11 @@ +include dpkg.inc +DEPENDS += "bzip2" + +inherit autotools gettext + +EXTRA_OECONF = "--without-static-progs \ + --without-dselect \ + --with-start-stop-daemon \ + --with-zlib \ + --with-bz2lib \ + --without-sgml-doc" -- cgit v1.2.3 From 5baf523e20c9d0e245ea3753061c22f3e8d6b05a Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Mon, 13 Feb 2006 02:31:57 +0000 Subject: edje-utils: fix DEPENDS --- packages/efl/edje-utils_0.5.0.023.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/efl/edje-utils_0.5.0.023.bb b/packages/efl/edje-utils_0.5.0.023.bb index 6432fc1267..837157ee3e 100644 --- a/packages/efl/edje-utils_0.5.0.023.bb +++ b/packages/efl/edje-utils_0.5.0.023.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Edje is a complex graphical design & layout library." -DEPENDS = "edje" +DEPENDS = "edje embryo-utils gcc" LICENSE = "MIT" PR = "r6" -- cgit v1.2.3 From 9f76c732772f6633c9efe45e5975a22c7dbc8ffb Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Mon, 13 Feb 2006 03:44:53 +0000 Subject: efl.bbclass: fix changes reverted by a bad merge --- classes/efl.bbclass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/classes/efl.bbclass b/classes/efl.bbclass index 4762825e2e..e5968b9aec 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -73,9 +73,9 @@ do_stage_append () { fi } -PACKAGES = "${SRCNAME} ${SRCNAME}-themes ${SRCNAME}-dev ${SRCNAME}-examples " -FILES_${SRCNAME} = "${libdir}/lib*.so*" -FILES_${SRCNAME}-themes = "${datadir}/${SRCNAME}/themes ${datadir}/${SRCNAME}/data ${datadir}/${SRCNAME}/fonts ${datadir}/${SRCNAME}/pointers ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/users ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/styles" -FILES_${SRCNAME}-dev += "${bindir}/${SRCNAME}-config ${libdir}/pkgconfig ${libdir}/lib*.?a ${datadir}/${SRCNAME}/include" -FILES_${SRCNAME}-examples = "${bindir} ${datadir}" +PACKAGES = "${PN} ${PN}-themes ${PN}-dev ${PN}-examples " +FILES_${PN} = "${libdir}/lib*.so*" +FILES_${PN}-themes = "${datadir}/${PN}/themes ${datadir}/${PN}/data ${datadir}/${PN}/fonts ${datadir}/${PN}/pointers ${datadir}/${PN}/images ${datadir}/${PN}/users ${datadir}/${PN}/images ${datadir}/${PN}/styles" +FILES_${PN}-dev = "${bindir}/${PN}-config ${libdir}/pkgconfig ${libdir}/lib*.?a ${libdir}/lib*.a" +FILES_${PN}-examples = "${bindir} ${datadir}" -- cgit v1.2.3 From 3ba2eac54dd2b94c43ba514e49fcbc2faa99449b Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Mon, 13 Feb 2006 05:59:39 +0000 Subject: preferred-e-versions: add PREFERRED_VERSIONs for gnome-vfs-dbus and gcc --- conf/distro/preferred-e-versions.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/distro/preferred-e-versions.inc b/conf/distro/preferred-e-versions.inc index f59d32ba1c..53f363bf3d 100644 --- a/conf/distro/preferred-e-versions.inc +++ b/conf/distro/preferred-e-versions.inc @@ -29,3 +29,7 @@ PREFERRED_VERSION_entrance = "0.9.0.005" PREFERRED_PROVIDER_virtual/evas = "evas-x11" PREFERRED_PROVIDER_virtual/ecore = "ecore-x11" PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11" + +PREFERRED_VERSION_gnome-vfs-dbus = "svn" + +PREFERRED_VERSION_gcc = "3.4.4" -- cgit v1.2.3 From 74e91a4494df850d47e609ef5de8d182e3493828 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 13 Feb 2006 21:21:38 +0000 Subject: sharp-binary stuff: fixed SRC_URI to openzaurus.sf.net --- .../sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb | 2 +- packages/sharp-binary-only/sharp-sdmmc-support.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb b/packages/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb index 82fea715e5..50301aae9d 100644 --- a/packages/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb +++ b/packages/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb @@ -6,7 +6,7 @@ LICENSE = "CLOSED" RDEPENDS = "kernel (${KERNEL_VERSION})" PR = "r4" -SRC_URI = "http://www.openzaurus.org/mirror/camera-modules-2.4.18-rmk7-pxa3-embedix.tar.bz2 \ +SRC_URI = "http://openzaurus.sf.net/mirror/camera-modules-2.4.18-rmk7-pxa3-embedix.tar.bz2 \ file://CE-AG06.dat \ file://sharpzdc \ file://sharpzdc.conf" diff --git a/packages/sharp-binary-only/sharp-sdmmc-support.bb b/packages/sharp-binary-only/sharp-sdmmc-support.bb index 8d5cc70317..fa4e66e7e8 100644 --- a/packages/sharp-binary-only/sharp-sdmmc-support.bb +++ b/packages/sharp-binary-only/sharp-sdmmc-support.bb @@ -17,7 +17,7 @@ PV_akita = "${KERNEL2420}" PV_borzoi = "${KERNEL2420}" PV_spitz = "${KERNEL2420}" -SRC_URI = "http://www.openzaurus.org/mirror/sd-modules-2.4.18-rmk7-pxa3-embedix-r4.tar.bz2 \ +SRC_URI = "http://openzaurus.sf.net/mirror/sd-modules-2.4.18-rmk7-pxa3-embedix-r4.tar.bz2 \ file://sd \ file://sdmgr \ file://sdcontrol" -- cgit v1.2.3