diff options
Diffstat (limited to 'packages')
39 files changed, 931 insertions, 412 deletions
diff --git a/packages/abiword/abiword_2.0.14.bb b/packages/abiword/abiword_2.0.14.bb index d7b0ab507b..751ec9fdf8 100644 --- a/packages/abiword/abiword_2.0.14.bb +++ b/packages/abiword/abiword_2.0.14.bb @@ -13,7 +13,7 @@ S = "${WORKDIR}/abiword-${PV}/abi" SRC_URI = "http://download.sourceforge.net/abiword/abiword-${PV}.tar.bz2" -FILES_${PN} += " ${datadir}/icons/* \ +FILES_${PN} += "${datadir}/icons/* \ ${datadir}/AbiSuite-2.0/AbiWord/glade \ ${datadir}/AbiSuite-2.0/AbiWord/scripts \ ${datadir}/AbiSuite-2.0/AbiWord/system.profile-en \ @@ -21,7 +21,7 @@ ${datadir}/AbiSuite-2.0/AbiWord/system.profile-en_GB \ #${datadir}/AbiSuite-2.0/templates/A4.awt \ #${datadir}/AbiSuite-2.0/templates/US-Letter.awt \ ${datadir}/AbiSuite-2.0/templates/normal.awt \ -${datadir}/AbiSuite-2.0/templates/normal.awt-en_GB \ +${datadir}/AbiSuite-2.0/templates/normal.awt-en_GB \ ${datadir}/AbiSuite-2.0/templates/Employee-Directory.awt \ ${datadir}/AbiSuite-2.0/templates/Business-Report.awt \ ${datadir}/AbiSuite-2.0/templates/Fax-Coversheet.awt \ diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 4ca12c7aab..2c8071b81b 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -21,7 +21,7 @@ SRC_URI = " \ file://licenses/GPL-2 \ file://licenses/LGPL-2 \ file://licenses/LGPL-2.1 \ - file://licenses/Artistic " + file://licenses/Artistic " S = "${WORKDIR}" docdir_append = "/${P}" @@ -38,7 +38,7 @@ dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \ ${localstatedir}/lock/subsys ${localstatedir}/log \ ${localstatedir}/run ${localstatedir}/spool \ /mnt /media /media/card /media/cf /media/net /media/ram \ - /media/union /media/realroot /media/hdd \ + /media/union /media/realroot /media/hdd \ /media/mmc1" conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \ ${sysconfdir}/inputrc ${sysconfdir}/issue /${sysconfdir}/issue.net \ diff --git a/packages/bluez-utils/bluez-utils-common_2.17.inc b/packages/bluez-utils/bluez-utils-common_2.17.inc index 69f9514695..348636b926 100644 --- a/packages/bluez-utils/bluez-utils-common_2.17.inc +++ b/packages/bluez-utils/bluez-utils-common_2.17.inc @@ -4,7 +4,7 @@ PRIORITY = "optional" DEPENDS = "bluez-libs-${PV} pcmcia-cs" RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils" LICENSE = "GPL" -PR = "r2" +PR = "r3" SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ file://base.patch;patch=1 \ diff --git a/packages/bluez-utils/files/base.patch b/packages/bluez-utils/files/base.patch index c4bb288303..337c9aa73e 100644 --- a/packages/bluez-utils/files/base.patch +++ b/packages/bluez-utils/files/base.patch @@ -5,7 +5,13 @@ --- bluez-utils-2.17/pcmcia/bluetooth~base.patch +++ bluez-utils-2.17/pcmcia/bluetooth -@@ -18,6 +18,10 @@ +@@ -15,9 +15,16 @@ + + if [ -r ./shared ]; then . ./shared ; else . /etc/pcmcia/shared ; fi + ++# Give the port some time to complete initialization ++sleep 5 ++ # Get device attributes get_info $DEVICE @@ -16,7 +22,7 @@ # # Serial devices # -@@ -25,7 +29,7 @@ +@@ -25,7 +32,7 @@ IRQ=`setserial /dev/$DEVICE | sed -e 's/.*IRQ: //'` setserial /dev/$DEVICE irq 0 ; setserial /dev/$DEVICE irq $IRQ diff --git a/packages/gimp/gimp_2.2.7.bb b/packages/gimp/gimp_2.2.7.bb index 0107916fdc..5380106a64 100644 --- a/packages/gimp/gimp_2.2.7.bb +++ b/packages/gimp/gimp_2.2.7.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The GIMP is the GNU Image Manipulation Program." HOMEPAGE = "http://www.gimp.org" LICENSE = "GPL" -MAINTAINER = "Koen Kooi <koen@handhelds.org> +MAINTAINER = "Koen Kooi <koen@handhelds.org>" SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.2/gimp-${PV}.tar.bz2" diff --git a/packages/kdepimpi/files/opie-fontselector-copy.patch b/packages/kdepimpi/files/opie-fontselector-copy.patch deleted file mode 100644 index c38c25a359..0000000000 --- a/packages/kdepimpi/files/opie-fontselector-copy.patch +++ /dev/null @@ -1,19 +0,0 @@ -Patch taken from OPIE project - -Index: ofontselector.cpp -=================================================================== -RCS file: /cvs/opie/libopie2/opieui/ofontselector.cpp,v -retrieving revision 1.7 -retrieving revision 1.8 -diff -u -r1.7 -r1.8 ---- kdepim/microkde/ofontselector.cpp.orig 2005-03-08 14:13:14 +0100 -+++ kdepim/microkde/ofontselector.cpp 2005-03-08 14:14:48 +0100 -@@ -137,7 +137,7 @@ - this, SLOT( fontSizeClicked( int ) ) ); - gridLayout->addWidget( d-> m_font_size_list, 3, 1 ); - -- d-> m_pointbug = ( qt_version ( ) <= 233 ); -+ d->m_pointbug = ( qt_version() == 232 || qt_version() == 233 ); // SharpROM uses 2.3.2 - - if ( withpreview ) { - d-> m_preview = new QMultiLineEdit ( this, "Preview" ); diff --git a/packages/kdepimpi/kdepimpi_2.1.9.bb b/packages/kdepimpi/kdepimpi_2.1.13.bb index f3dde1a2fd..f3dde1a2fd 100644 --- a/packages/kdepimpi/kdepimpi_2.1.9.bb +++ b/packages/kdepimpi/kdepimpi_2.1.13.bb diff --git a/packages/kdepimpi/pwmpi.inc b/packages/kdepimpi/pwmpi.inc index 7f4ebcc5a0..2b77eed0de 100644 --- a/packages/kdepimpi/pwmpi.inc +++ b/packages/kdepimpi/pwmpi.inc @@ -12,6 +12,9 @@ INCLUDEPATH+=${STAGING_INCDIR}/kdepimpi/ \ LIBS+=-L${STAGING_LIBDIR}/kdepimpi/ \ " +do_configure_prepend() { +} + do_stage() { } diff --git a/packages/kdepimpi/pwmpi_2.1.9.bb b/packages/kdepimpi/pwmpi_2.1.13.bb index 904f640955..904f640955 100644 --- a/packages/kdepimpi/pwmpi_2.1.9.bb +++ b/packages/kdepimpi/pwmpi_2.1.13.bb diff --git a/packages/libopie/libopie2.inc b/packages/libopie/libopie2.inc index 1ee7900fb8..75648b3c79 100644 --- a/packages/libopie/libopie2.inc +++ b/packages/libopie/libopie2.inc @@ -32,10 +32,15 @@ python __anonymous () { do_compile() { install -d ${STAGING_INCDIR}/opie2 install -d ${STAGING_INCDIR}/opie2/private - for i in `find . -name "*.h"` - do + for module in opiecore opiedb opiemm opienet opiepim opiesecurity opieui + do + cd $module + for i in `find . -name "*.h"` + do install -m 0644 $i ${STAGING_INCDIR}/opie2/`basename $i` - done + done + cd .. + done for i in opimcontactsortvector.h opimoccurrence_p.h opimsortvector.h opimtodosortvector.h vobject_p.h opimeventsortvector.h do diff --git a/packages/linux/linux-openzaurus-2.6.12-mm1/dtl1_cs-add-socket-revE.patch b/packages/linux/linux-openzaurus-2.6.12-mm1/dtl1_cs-add-socket-revE.patch new file mode 100644 index 0000000000..a2dbce3325 --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.12-mm1/dtl1_cs-add-socket-revE.patch @@ -0,0 +1,10 @@ +--- linux-2.6.12/drivers/bluetooth/dtl1_cs.c.orig 2005-07-05 11:19:50.000000000 +0200 ++++ linux-2.6.12/drivers/bluetooth/dtl1_cs.c 2005-07-05 11:19:51.000000000 +0200 +@@ -810,6 +810,7 @@ + static struct pcmcia_device_id dtl1_ids[] = { + PCMCIA_DEVICE_PROD_ID12("Nokia Mobile Phones", "DTL-1", 0xe1bfdd64, 0xe168480d), + PCMCIA_DEVICE_PROD_ID12("Socket", "CF", 0xb38bcc2e, 0x44ebf863), ++ PCMCIA_DEVICE_PROD_ID12("Socket", "CF+ Personal Network Card", 0xb38bcc2e, 0xe732bae3), + PCMCIA_DEVICE_NULL + }; + MODULE_DEVICE_TABLE(pcmcia, dtl1_ids); diff --git a/packages/linux/linux-openzaurus_2.6.11.bb b/packages/linux/linux-openzaurus_2.6.11.bb index 725e130fcf..d93006ffa7 100644 --- a/packages/linux/linux-openzaurus_2.6.11.bb +++ b/packages/linux/linux-openzaurus_2.6.11.bb @@ -23,7 +23,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \ ${JLSRC}/zaurus-base-2.6.11.diff.gz;patch=1 \ ${RPSRC}/rndis_fix-r0.patch;patch=1 \ ${RPSRC}/w100_malloc-r2.patch;patch=1 \ - ${RPSRC}/pxairq_printk-r0.patch;patch=1 \ + ${RPSRC}/pxairq_printk-r0.patch;patch=1 \ ${RPSRC}/corgi_kbd-r14.patch;patch=1 \ ${RPSRC}/corgi_ts-r10.patch;patch=1 \ ${RPSRC}/sharp_multi_scoop-r1.patch;patch=1 \ @@ -55,11 +55,11 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \ ${DOSRC}/tosa-power-r2.patch;patch=1 \ ${DOSRC}/tosa-mmc-r2.patch;patch=1 \ ${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \ - ${JLSRC}/zaurus-leds-2.6.11.diff.gz;patch=1 \ + ${JLSRC}/zaurus-leds-2.6.11.diff.gz;patch=1 \ file://add-oz-release-string.patch;patch=1 \ file://add-elpp-stuff.patch;patch=1 \ file://pxa-serial-hack.patch;patch=1 \ - ${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \ + ${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \ file://defconfig-c7x0 \ file://defconfig-collie \ file://defconfig-poodle \ diff --git a/packages/linux/linux-openzaurus_2.6.12-mm1.bb b/packages/linux/linux-openzaurus_2.6.12-mm1.bb index 00d3d891b9..fc519ecfbc 100644 --- a/packages/linux/linux-openzaurus_2.6.12-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.12-mm1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r3" +PR = "r4" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -28,10 +28,10 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${RPSRC}/machtype_update-r1.patch;patch=1 \ ${RPSRC}/collie_typofix-r0.patch;patch=1 \ ${RPSRC}/rmk_armsmp_fix-r0.patch;patch=1 \ - ${RPSRC}/corgi_tspmu-r1.patch;patch=1 \ + ${RPSRC}/corgi_tspmu-r1.patch;patch=1 \ ${RPSRC}/oprofile_trace-r3.patch;patch=1 \ ${RPSRC}/preempt_nwfpe-r0.patch;patch=1 \ - ${RPSRC}/w100_core-r0.patch;patch=1 \ + ${RPSRC}/w100_core-r0.patch;patch=1 \ ${RPSRC}/w100_corgi-r0.patch;patch=1 \ ${RPSRC}/corgi_kbd3-r6.patch;patch=1 \ ${RPSRC}/corgi_kbd_susres-r0.patch;patch=1 \ @@ -48,7 +48,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${RPSRC}/corgi_snd-r6.patch;patch=1 \ ${RPSRC}/pxa_i2c-r2.patch;patch=1 \ ${DOSRC}/pxa-i2c-suspend-r0.patch;patch=1 \ - ${DOSRC}/pxa-i2c-func-r0.patch;patch=1 \ + ${DOSRC}/pxa-i2c-func-r0.patch;patch=1 \ ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ ${RPSRC}/spitz_mtd-r0.patch;patch=1 \ ${RPSRC}/ipaq/hx2750_base-r17.patch;patch=1 \ @@ -73,8 +73,9 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \ file://add-oz-release-string.patch;patch=1 \ file://add-elpp-stuff.patch;patch=1 \ - file://pxa-serial-hack.patch;patch=1 \ + file://pxa-serial-hack.patch;patch=1 \ ${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \ + file://dtl1_cs-add-socket-revE.patch;patch=1 \ file://defconfig-c7x0 \ file://defconfig-ipaq-pxa-2.6 \ file://defconfig-collie \ diff --git a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb index 3855300e31..b1dc3d7081 100644 --- a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb +++ b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb @@ -35,7 +35,7 @@ SRC_URI = "http://developer.ezaurus.com/sl_j/source/c1000/20050228/linux-c1000-2 file://logo.patch;patch=1 \ file://initsh.patch;patch=1 \ file://disable-pcmcia-probe.patch;patch=1 \ - file://deviceinfo.patch;patch=1 \ + file://deviceinfo.patch;patch=1 \ file://corgi-fbcon-logo.patch;patch=1 \ file://corgi-default-brightness.patch;patch=1 \ file://1764-1.patch;patch=1 \ diff --git a/packages/maemo/nokia770-init/fixup-770.sh b/packages/maemo/nokia770-init/fixup-770.sh index 02c18d4108..b65fb131e3 100644 --- a/packages/maemo/nokia770-init/fixup-770.sh +++ b/packages/maemo/nokia770-init/fixup-770.sh @@ -4,6 +4,14 @@ case "$1" in echo -n "Unmounting virtual fs from initrd" umount /mnt/initfs/sys umount /mnt/initfs/proc + ln -s /dev/vc/0 /dev/tty0 + ln -s /dev/vc/1 /dev/tty1 + ln -s /dev/vc/2 /dev/tty2 + ln -s /dev/vc/3 /dev/tty3 + ln -s /dev/vc/4 /dev/tty4 + ln -s /dev/vc/5 /dev/tty5 + ln -s /dev/vc/6 /dev/tty6 + ln -s /dev/vc/7 /dev/tty7 ;; stop) ;; diff --git a/packages/maemo/nokia770-init_1.0.bb b/packages/maemo/nokia770-init_1.0.bb index 1cef924598..ab3333b438 100644 --- a/packages/maemo/nokia770-init_1.0.bb +++ b/packages/maemo/nokia770-init_1.0.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" MAINTAINER = "Florian Boor <florian@kernelconcepts.de" -PR = "r1" +PR = "r3" DEPENDS = "base-passwd hotplug-dbus" @@ -17,7 +17,7 @@ INITSCRIPT_PARAMS = "defaults 01" do_install () { install -d ${D}${sysconfdir}/init.d - install -m 755 ${S}/fixup-770.sh ${D}/${sysconfdir}/init.d/fixup-770.sh + install -m 755 ${WORKDIR}/fixup-770.sh ${D}/${sysconfdir}/init.d/fixup-770.sh install -d ${D}/lib/firmware } @@ -31,7 +31,10 @@ if [ "x$D" != "x" ]; then fi # set up some links to firmware and modules in initrd - ln -sf /mnt/initfs/lib/firmware/* /lib/firmware/ + mkdir -p /lib/firmware + ln -sf /mnt/initfs/usr/lib/hotplug/firmware/3825.arm /lib/firmware/3825.arm + ln -sf /mnt/initfs/usr/lib/hotplug/firmware/brf6150fw.bin /lib/firmware/brf6150fw.bin + ln -sf /mnt/initfs/usr/lib/hotplug/firmware/mtlm3825.arm /lib/firmware/mtlm3825.arm rm -rf /lib/modules ln -s /mnt/initfs/lib/modules /lib/modules diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb index 93e7c0b0a8..306d31a39e 100644 --- a/packages/meta/meta-gpe.bb +++ b/packages/meta/meta-gpe.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Meta-package for GPE Palmtop Environment" MAINTAINER = "Phil Blundell <pb@handhelds.org>" PR = "r36" -ALLOW_EMPTY = 1 +ALLOW_EMPTY = "1" gpe-base-depends = "\ diet-x11 \ @@ -32,7 +32,7 @@ gpe-task-base = "\ gpe-autostarter \ libgtkstylus \ detect-stylus \ - teleport \ + teleport \ xauth" RDEPENDS_gpe-task-base := "gdk-pixbuf-loader-png \ @@ -102,4 +102,4 @@ DEPENDS += " ${gpe-task-games}" DEPENDS += "matchbox-themes-extra" -LICENSE = MIT +LICENSE = "MIT" diff --git a/packages/meta/meta-maemo.bb b/packages/meta/meta-maemo.bb index 6f8e886a22..17b9c66653 100644 --- a/packages/meta/meta-maemo.bb +++ b/packages/meta/meta-maemo.bb @@ -4,7 +4,7 @@ PACKAGES = maemo-task-base maemo-task-apps maemo-task-libs-install maemo-task DESCRIPTION = "Meta-package for maemo environment" MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" -ALLOW_EMPTY = 1 +ALLOW_EMPTY = "1" maemo-base-depends = "\ diet-x11 \ @@ -80,7 +80,7 @@ maemo-task-apps = "\ hildon-home \ hildon-navigator \ hildon-control-panel \ - osso-application-installer \ + osso-application-installer \ osso-app-killer \ osso-screenshot-tool \ gpe-todo-hildon \ @@ -89,4 +89,4 @@ maemo-task-apps = "\ RDEPENDS_maemo-task-apps := "${maemo-task-apps}" DEPENDS += " ${maemo-task-apps}" -LICENSE = MIT +LICENSE = "MIT" diff --git a/packages/meta/meta-sectest-gpe.bb b/packages/meta/meta-sectest-gpe.bb index 6976699029..db9d86cdd6 100644 --- a/packages/meta/meta-sectest-gpe.bb +++ b/packages/meta/meta-sectest-gpe.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Meta-package for GPE Security Testing Image" MAINTAINER = "Bob Davies tyggerbob@rogers.com>" PR = "r5" -ALLOW_EMPTY = 1 +ALLOW_EMPTY = "1" gpe-base-depends = "\ diet-x11 \ @@ -84,7 +84,7 @@ sectest-task-apps = "\ kismet \ hydra \ thcrut \ - driftnet \ + driftnet \ miniclipboard" RDEPENDS_sectest-task-apps := "${sectest-task-apps}" @@ -93,4 +93,4 @@ DEPENDS += " ${sectest-task-apps}" DEPENDS += "matchbox-themes-extra gtk-industrial-engine" -LICENSE = MIT +LICENSE = "MIT" diff --git a/packages/meta/opie-collections.inc b/packages/meta/opie-collections.inc index a2b2e79bdb..c2d15dee58 100644 --- a/packages/meta/opie-collections.inc +++ b/packages/meta/opie-collections.inc @@ -36,7 +36,7 @@ OPIE_BASE_STYLES = "opie-style-flat opie-style-liquid opie-style-fresh \ OPIE_BASE_DEPENDS = "ipkg timezones ntp bluez-utils-nodbus irda-utils \ openobex-apps libopieobex0 wireless-tools usbutils" OPIE_BASE_RDEPENDS = "timezones ntpdate opie-handwriting-classicset \ - bluez-utils-nodbus openobex-apps libopieobex0 wireless-tools usbutils" + bluez-utils-nodbus openobex-apps libopieobex0 wireless-tools " # # Clamshell models can benefit from the autorotate applet @@ -98,5 +98,9 @@ def opie_more_rdepends(d): if root_flash_size >= 24: return bb.data.getVar( "OPIE_RDEPENDS_24", d, True ) else: return " " -OPIE_MORE_DEPENDS := "${@opie_more_depends(d)}" -OPIE_MORE_RDEPENDS := "${@opie_more_rdepends(d)}" +OPIE_MORE_DEPENDS := "${@opie_more_depends(d)}" + + + + +# # OPIE_MORE_RDEPENDS := "${@opie_more_rdepends(d)}" diff --git a/packages/meta/pivotboot-image.bb b/packages/meta/pivotboot-image.bb index 7d533e3806..0b8211cb8a 100644 --- a/packages/meta/pivotboot-image.bb +++ b/packages/meta/pivotboot-image.bb @@ -12,6 +12,6 @@ FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/${D e##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/e" FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11 \ - opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie \ + opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie" -LICENSE = MIT +LICENSE = "MIT" diff --git a/packages/kdepimpi/files/.mtn2git_empty b/packages/module-init-tools/module-init-tools-3.2-pre7/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/kdepimpi/files/.mtn2git_empty +++ b/packages/module-init-tools/module-init-tools-3.2-pre7/.mtn2git_empty diff --git a/packages/module-init-tools/module-init-tools-3.2-pre7/ignore_arch_directory b/packages/module-init-tools/module-init-tools-3.2-pre7/ignore_arch_directory new file mode 100644 index 0000000000..185ea7a3a5 --- /dev/null +++ b/packages/module-init-tools/module-init-tools-3.2-pre7/ignore_arch_directory @@ -0,0 +1,24 @@ +diff -ruN module-init-tools-3.1-pre6.orig/modprobe.8 module-init-tools-3.1-pre6/modprobe.8 +--- module-init-tools-3.2-pre7/modprobe.8.orig 2005-07-05 13:52:32.000000000 +0200 ++++ module-init-tools-3.2-pre7/modprobe.8 2005-07-05 13:52:42.000000000 +0200 +@@ -31,6 +31,7 @@ + \fI/etc/modprobe.conf\fR configuration file and + \fI/etc/modprobe.d\fR directory + (see \fBmodprobe.conf\fR(5)). ++All files in the \fI/etc/modprobe.d/arch/\fR directory are ignored. + .PP + Note that this version of \fBmodprobe\fR does not + do anything to the module itself: the work of resolving symbols +--- module-init-tools-3.2-pre7/modprobe.c.orig 2005-07-05 13:50:00.000000000 +0200 ++++ module-init-tools-3.2-pre7/modprobe.c 2005-07-05 13:50:15.000000000 +0200 +@@ -1158,6 +1158,10 @@ + DIR *dir; + int ret = 0; + ++ /* ignore everything in this directory */ ++ if (streq(filename, "/etc/modprobe.d/arch")) ++ return 1; ++ + /* Reiser4 has file/directory duality: treat it as both. */ + dir = opendir(filename); + if (dir) { diff --git a/packages/module-init-tools/module-init-tools-3.2-pre7/manpagesopt b/packages/module-init-tools/module-init-tools-3.2-pre7/manpagesopt new file mode 100644 index 0000000000..ee1454c6ef --- /dev/null +++ b/packages/module-init-tools/module-init-tools-3.2-pre7/manpagesopt @@ -0,0 +1,39 @@ +Index: module-init-tools-3.1/configure.in +=================================================================== +--- module-init-tools-3.1.orig/configure.in 2004-11-12 00:05:25.000000000 -0500 ++++ module-init-tools-3.1/configure.in 2005-01-20 02:23:16.409792288 -0500 +@@ -41,5 +41,14 @@ + fi]) + AC_SUBST(MODULE_DIR) + +-AC_OUTPUT([Makefile]) ++AC_ARG_ENABLE(manpages, ++[ --disable-manpages Disable man page generation.], ++[if test x"$enableval" != x"no"; then ++ enable_manpages=yes ++else ++ enable_manpages=no ++fi], ++[enable_manpages=yes]) ++AM_CONDITIONAL([MANPAGES], test x"$enable_manpages" = x"yes") + ++AC_OUTPUT([Makefile]) +--- module-init-tools-3.2-pre7/Makefile.am.orig 2005-07-05 13:55:06.000000000 +0200 ++++ module-init-tools-3.2-pre7/Makefile.am 2005-07-05 13:55:31.000000000 +0200 +@@ -21,13 +21,14 @@ + MAN5 = modprobe.conf.5 modules.dep.5 + MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8 + SGML = $(addprefix doc/, $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml)) +-man_MANS = $(MAN5) $(MAN8) + # If they haven't overridden mandir, fix it (never /man!) + mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then echo /usr/share/man; else echo $(prefix)/share/man; fi; else echo @mandir@; fi) + + TESTSUITE := $(shell find tests -type f ! -name '*~') + +-EXTRA_DIST = generate-modprobe.conf modprobe.devfs FAQ CODING stress_modules.sh install-with-care $(SGML) $(man_MANS) $(TESTSUITE) ++if MANPAGES ++man_MANS = $(MAN5) $(MAN8) ++endif + + sbin_PROGRAMS = insmod modprobe rmmod depmod modinfo insmod.static + bin_PROGRAMS = lsmod diff --git a/packages/module-init-tools/module-init-tools-cross_3.1.bb b/packages/module-init-tools/module-init-tools-cross_3.1.bb index ce3c232df2..56fec56072 100644 --- a/packages/module-init-tools/module-init-tools-cross_3.1.bb +++ b/packages/module-init-tools/module-init-tools-cross_3.1.bb @@ -1,10 +1,10 @@ -LICENSE = GPL +LICENSE = "GPL" include module-init-tools_${PV}.bb inherit cross DEFAULT_PREFERENCE = "0" PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6" -PR=r3 +PR="r3" # When cross compiling depmod as shipped cannot handle endian # differences between host and target, this fixes the problem. diff --git a/packages/module-init-tools/module-init-tools_3.1.bb b/packages/module-init-tools/module-init-tools_3.1.bb index 25db614ed6..62523f513a 100644 --- a/packages/module-init-tools/module-init-tools_3.1.bb +++ b/packages/module-init-tools/module-init-tools_3.1.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "base" DESCRIPTION = "This package contains a set of programs for loading, inserting, and \ removing kernel modules for Linux (versions 2.5.48 and above). It serves \ diff --git a/packages/module-init-tools/module-init-tools_3.2-pre7.bb b/packages/module-init-tools/module-init-tools_3.2-pre7.bb new file mode 100644 index 0000000000..90da33addb --- /dev/null +++ b/packages/module-init-tools/module-init-tools_3.2-pre7.bb @@ -0,0 +1,59 @@ +DESCRIPTION = "This package contains a set of programs for loading, inserting, and \ +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" + +PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" +RDEPENDS_${PN} += "module-init-tools-depmod" + +FILES_module-init-tools-depmod = "${sbindir}/depmod.26" +FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static" + +SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \ + file://ignore_arch_directory;patch=1 \ + file://modutils_extension;patch=1 \ + file://no_man_rebuild;patch=1 \ + file://manpagesopt;patch=1 " +S = "${WORKDIR}/module-init-tools-${PV}" + +EXTRA_OECONF = "--disable-manpages" + +bindir = "/bin" +sbindir = "/sbin" + +inherit autotools + +do_install() { + autotools_do_install + for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do + mv ${D}/$f ${D}/$f.26 + done +} + +pkg_postinst_module-init-tools() { +#!/bin/sh +for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do +bn=`basename $f` + update-alternatives --install /$f $bn /$f.26 20 +done +} + +pkg_prerm_module-init-tools() { +#!/bin/sh +for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do +bn=`basename $f` + update-alternatives --remove $bn /$f.26 |