diff options
Diffstat (limited to 'packages')
26 files changed, 332 insertions, 52 deletions
diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb index 82314a8f22..2df0e16792 100644 --- a/packages/altboot/altboot_0.0.0.bb +++ b/packages/altboot/altboot_0.0.0.bb @@ -6,7 +6,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" LICENSE = "GPL" IGNORE_STRIP_ERRORS = "1" -PR = "r33" +PR = "r34" SRC_URI = "file://altboot-menu \ diff --git a/packages/altboot/files/akita/altboot-2.6.cfg b/packages/altboot/files/akita/altboot-2.6.cfg index 69f7c8351b..c9a030b348 100644 --- a/packages/altboot/files/akita/altboot-2.6.cfg +++ b/packages/altboot/files/akita/altboot-2.6.cfg @@ -9,6 +9,7 @@ SH_SHELL="/bin/sh" IMAGE_PATH="boot-images" IMAGE_TYPE="ext2" FSCK_IMAGES="yes" +ENABLE_IMAGECONF="yes" SD_DEVICE="/dev/mmcblk0p1" SD_KERNEL_MODULE="" diff --git a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS index baa426218b..e01af7faad 100644 --- a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS +++ b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS @@ -20,11 +20,11 @@ run_module() { init_rootfs # Needed for NFS - /etc/init.d/portmap start >/dev/tty1 2>&1 || die "/etc/init.d/portmap start failed!" + /etc/init.d/portmap start >/dev/null 2>&1 || die "/etc/init.d/portmap start failed!" # For some reason NFS mounts hang if /e/i/networking is not run. # For the time beeing I'm too lazy to investigate ;) - /etc/init.d/networking start || die "/etc/init.d/networking start failed!" + /etc/init.d/networking start >/dev/null 2>&1 || die "/etc/init.d/networking start failed!" sleep 2 @@ -126,6 +126,15 @@ run_module() { mkdir -p /media/nfsroot || die "mkdir -p /media/nfsroot failed!" echo -n "Mounting NFS root..." + + if ( mount | grep -q "/media/nfsroot" ) + then + echo "/media/nfsroot already used, tying to umount..." + umount /media/image + losetup -d /dev/loop0 + umount /media/nfsroot || die "umount failed!" + fi + mount -t nfs "$selection" /media/nfsroot && echo ok || die "mount -t nfs "$selection" /media/nfsroot failed!" # Use configured resolv.conf in the pivoted rootfs diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func index 612a0243b2..0cc59116ce 100644 --- a/packages/altboot/files/altboot.func +++ b/packages/altboot/files/altboot.func @@ -93,6 +93,8 @@ pivot_realfs() { mount -o remount,ro / >/dev/null 2>&1 + test "$ENABLE_IMAGECONF" = yes && image_conf $1 + do_pivot "$1" "$RL" } @@ -152,27 +154,28 @@ pivot_image() { echo "" - echo "Using [$IMAGE_NAME]" mkdir -p /media/image || die "mkdir -p /media/image failed" - echo "Setting up loopback (/dev/loop0) for $IMAGE_NAME" losetup /dev/loop0 $1/$IMAGE_PATH/$IMAGE_NAME || die "losetup /dev/loop0 $1/$IMAGE_PATH/$IMAGE_NAME failed!" check_fs /dev/loop0 $IMAGE_TYPE - echo -e "\n* * * Booting rootfs image * * *\n" + echo -e "\n* * * Mounting rootfs image * * *\n" # Busybox's "mount" doesn't seem to like "-o loop" for some reason # It works on collie and b0rks on poodle. if [ "$IMAGE_TYPE" = "" ]; then IMAGE_TYPE="auto" fi + # If mount fails it has the tendency to spew out a _lot_ of error messages. # We direct the output to /dev/null so the user can see which step actually failed. mount /dev/loop0 -t $IMAGE_TYPE /media/image >/dev/null 2>&1 || die "mount -t $IMAGE_TYPE /dev/loop0 /media/image failed!" mkdir -p /media/image/media/ROM || die "mkdir -p /media/image/media/ROM failed" + test "$ENABLE_IMAGECONF" = yes && image_conf /media/image + do_pivot /media/image "$RL" } @@ -214,6 +217,105 @@ do_pivot(){ } +# $1: Path to mounted rootfs +image_conf(){ + ! test -d "$1" && die "image_conf: [$1] not found / no directory" + + test -e "$1/etc/.image_conf.done" && return + + echo -e "\n\n* * * rootfs configuration * * *\n" + echo -e "This setup lets you reconfigure your new rootfs." + echo "Most probably the rootfs is configured with" + echo "defaults based on a flash installation." + echo "If unsure, go with the defaults by pressing <ENTER>." + echo "" + + if ( cat $1/etc/fstab | grep -v "^#" | grep -q "/home " ) + then + while true + do + echo "Usually your /home directory is located on another flash partition." + echo -n "Do you want me to move /home inside the loop-image? [N|y] " + read junk + + if test "$junk" = "y" -o "$junk" = "Y" + then + cat $1/etc/fstab | sed "/.*\/home.*/s/\/home/\/home.orig/" > $1/etc/fstab_ + mv $1/etc/fstab_ $1/etc/fstab + break + fi + + test "$junk" = "" -o "$junk" = n -o "$junk" = N && break + done + + fi + + echo "" + +# if ( cat $1/etc/fstab | grep -v "^#" | grep -q "/var" ) +# then +# while true +# do +# echo "This is mainly for testing purposes." +# echo -n "Do you want to configure /var as a normal non-tmpfs directory? [N|y] " +# read junk +# +# if test "$junk" = "y" -o "$junk" = "Y" +# then +# cat $1/etc/fstab | sed "/.*\/var.*/s/\(.*\)/#\ \1/" > $1/etc/fstab_ +# mv $1/etc/fstab_ $1/etc/fstab +# break +# fi +# +# test "$junk" = "" -o "$junk" = n -o "$junk" = N && break +# done +# fi + + echo "" + + if ( cat $1/etc/ipkg.conf | grep -q ^lists_dir ) + then + while true + do + echo -e "Wasting RAM is never a good idea.\nOnly say Y if your rootfs is very small in size" + echo -n "Do you want to store ipkg package data in RAM? [N|y] " + read junk + + if test "$junk" = "" -o "$junk" = n -o "$junk" = N + then + cat $1/etc/ipkg.conf | sed "/^lists_dir.*/s/\(.*\)/#\ \1/"> $1/etc/ipkg.conf_ + mv $1/etc/ipkg.conf_ $1/etc/ipkg.conf + break + fi + + test "$junk" = "y" -o "$junk" = "Y" && break + done + fi + + echo "" + + if ( cat $1/etc/ipkg.conf | grep -q "^dest sd" ) + then + while true + do + echo -n "Do you want to keep the SD, CF and /home ipkg install targets? [N|y] " + read junk + + if test "$junk" = "" -o "$junk" = n -o "$junk" = N + then + cat $1/etc/ipkg.conf | sed "/^dest\ \(sd\|cf\|home\).*/s/\(.*\)/#\ \1/" > $1/etc/ipkg.conf_ + mv $1/etc/ipkg.conf_ $1/etc/ipkg.conf + break + fi + + test "$junk" = "y" -o "$junk" = "Y" && break + done + fi + + + touch "$1/etc/.image_conf.done" +} + # This functions configures the master password for altboot if none is set set_password() { mount -o remount,rw / diff --git a/packages/altboot/files/collie/altboot-2.4.cfg b/packages/altboot/files/collie/altboot-2.4.cfg index 9d2560f76b..bc0f9ca054 100644 --- a/packages/altboot/files/collie/altboot-2.4.cfg +++ b/packages/altboot/files/collie/altboot-2.4.cfg @@ -8,7 +8,9 @@ REAL_INIT="/sbin/init.sysvinit" SH_SHELL="/bin/sh" IMAGE_PATH="boot-images" IMAGE_TYPE="ext2" -FSCK_IMAGES="no" +FSCK_IMAGES="yes" +ENABLE_IMAGECONF="yes" + SD_DEVICE="/dev/mmcda1" SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o" INIT_RUNLEVEL="5" diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot index ed95ce1c9c..22f3e86e83 100644 --- a/packages/altboot/files/init.altboot +++ b/packages/altboot/files/init.altboot @@ -283,10 +283,12 @@ wait_for_input() { } # * * * * * * This is the main function * * * * * * - -if test -f /proc/cmdline -a "$1" != "-force" +# Note: this is positivly ugly. If someone knows a better way to detect wheter +# we are already booted into a runlevel _without_ reading /var and / or using `runlevel` +# PLEASE let me know. +if test -f /proc/cmdline -a "`ps ax|wc -l|tr -d " "`" -gt 30 -a "$1" != "-force" then - echo "altboot: Using real init [$REAL_INIT] [$*] *" >/dev/tty1 + echo "altboot: Using real init [$REAL_INIT] [$*] [`ps ax|wc -l|tr -d " "`] *" >/dev/tty1 exec $REAL_INIT $* # exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1 exit 0 diff --git a/packages/altboot/files/poodle/altboot-2.4.cfg b/packages/altboot/files/poodle/altboot-2.4.cfg index 9d2560f76b..c5bd17050c 100644 --- a/packages/altboot/files/poodle/altboot-2.4.cfg +++ b/packages/altboot/files/poodle/altboot-2.4.cfg @@ -16,5 +16,7 @@ NO_GUI_RL="2" MASTER_PASSWORD="" ASK_PW_ON_BOOT="no" +ENABLE_IMAGECONF="yes" + SD_MOUNTPOINT="/media/card" CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/spitz/altboot-2.6.cfg b/packages/altboot/files/spitz/altboot-2.6.cfg index 69f7c8351b..c9a030b348 100644 --- a/packages/altboot/files/spitz/altboot-2.6.cfg +++ b/packages/altboot/files/spitz/altboot-2.6.cfg @@ -9,6 +9,7 @@ SH_SHELL="/bin/sh" IMAGE_PATH="boot-images" IMAGE_TYPE="ext2" FSCK_IMAGES="yes" +ENABLE_IMAGECONF="yes" SD_DEVICE="/dev/mmcblk0p1" SD_KERNEL_MODULE="" diff --git a/packages/altboot/files/tosa/altboot-2.4.cfg b/packages/altboot/files/tosa/altboot-2.4.cfg index edbaff8b87..c463ca0a43 100644 --- a/packages/altboot/files/tosa/altboot-2.4.cfg +++ b/packages/altboot/files/tosa/altboot-2.4.cfg @@ -8,7 +8,8 @@ SH_SHELL="/bin/sh" IMAGE_PATH="boot-images" IMAGE_TYPE="ext2" -FSCK_IMAGES="no" +FSCK_IMAGES="yes" +ENABLE_IMAGECONF="yes" SD_DEVICE="/dev/mmcda1" SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o" diff --git a/packages/gimp/gimp_2.2.7.bb b/packages/gimp/gimp_2.2.10.bb index 5380106a64..59fb0a0467 100644 --- a/packages/gimp/gimp_2.2.7.bb +++ b/packages/gimp/gimp_2.2.10.bb @@ -13,3 +13,8 @@ EXTRA_OECONF = " --disable-gtktest \ --without-libtiff \ --disable-print \ --enable-mp" + +do_configure_append() { + find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g +} + diff --git a/packages/gimp/gimp_2.3.3.bb b/packages/gimp/gimp_2.3.3.bb deleted file mode 100644 index 89d9be3e8d..0000000000 --- a/packages/gimp/gimp_2.3.3.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "The GIMP is the GNU Image Manipulation Program." -HOMEPAGE = "http://www.gimp.org" -LICENSE = "GPL" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" - -SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2" - -DEPENDS = "sed-native libart-lgpl gtk+ jpeg libpng libexif tiff" - -inherit autotools pkgconfig -#Don't laugh, this just builds a threaded gimp -EXTRA_OECONF = " --disable-gtktest \ - --disable-print \ - --disable-python \ - --enable-mp" - -do_configure_append() { - find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g -} diff --git a/packages/konqueror/konqueror-embedded_svn.bb b/packages/konqueror/konqueror-embedded_svn.bb new file mode 100644 index 0000000000..26d2877d81 --- /dev/null +++ b/packages/konqueror/konqueror-embedded_svn.bb @@ -0,0 +1,76 @@ +DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition" +BROKEN = "1" +SECTION = "opie/applications" +PRIORITY = "optional" +HOMEPAGE = "http://www.konqueror.org/" +DEPENDS = "openssl pcre libqte-mt dcopidl-native" +LICENSE = "LGPL/GPL" +DEFAULT_PREFERENCE = "-1" +FILES_${PN} = "${palmtopdir} /usr/share" +PR = "r0" +PV = "svn${SRCDATE}" + +# this Konqueror needs the KDEDIR set and the font helvetica installed on the target + +inherit autotools + +SRC_URI = "svn://anonsvn.kde.org/home/kde/tags/KDE/3.5.1;module=kdelibs \ + svn://anonsvn.kde.org/home/kde/trunk;module=kdenox " + +S = "${WORKDIR}/kdenox" + +export QMAKE = "${STAGING_BINDIR}/qmake" +export MOC = "${STAGING_BINDIR}/moc" +export UIC = "${STAGING_BINDIR}/uic" +export exec_prefix = "${palmtopdir}" +export CXXFLAGS = "-fexceptions -frtti -DKJS_VERBOSE=1 -DQT_THREAD_SUPPORT -DQ_OS_UNIX -DQT_NO_DOM -DENABLE_BOOKMARKS" +export PCRE_CONFIG = "invalid" + +EXTRA_OECONF = '--prefix=${palmtopdir} \ + --exec-prefix=${palmtopdir} \ + --includedir=${STAGING_INCDIR} \ + --with-extra-includes=${STAGING_INCDIR} \ + --with-extra-libs=${STAGING_LIBDIR} \ + --with-ssl-version=0.9.7e \ + --with-ssl-dir=${STAGING_LIBDIR}/.. \ + --with-qt-includes=${STAGING_DIR}/${HOST_SYS}/qt2/include \ + --with-qt-libraries=${STAGING_DIR}/${HOST_SYS}/qt2/lib \ + --enable-fontsubs \ + --with-konq-tmp-prefix=/tmp/kde-cache \ + --enable-static \ +# --disable-static \ +# --enable-shared \ + --disable-debug \ + --with-gui=road \ + --with-ipv6-lookup=no \ + --without-xinerama \ + --disable-scrollbars \ + --disable-selection \ + --disable-bookmarks \ + --with-javascript=static \ + --enable-debug=yes \ + --disable-printing \ + --enable-pcre \ + --without-arts \ + --enable-jshostext \ + --disable-selection \ + --enable-final \ + --enable-qt-embedded \ + --enable-rtti-embedded \ + --enable-mt \ + --enable-qt-mt\ + --enable-fwnewepg=yes \ + --enable-embedded ' + +do_configure_prepend() { + cd ${S} + if ! test -L admin + then + ln -s ../kdelibs/admin admin + fi + make -f Makefile.cvs +} + +do_compile_prepend() { + perl admin/am_edit +} diff --git a/packages/libxslt/libxslt_1.1.7.bb b/packages/libxslt/libxslt_1.1.7.bb index 81d4fddead..fd81cba5d2 100644 --- a/packages/libxslt/libxslt_1.1.7.bb +++ b/packages/libxslt/libxslt_1.1.7.bb @@ -10,7 +10,7 @@ PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" FILES_${PN}-dev += "${bindir}/xslt-config" FILES_${PN}-utils += "${bindir}" -SRC_URI = "http://xmlsoft.org/sources/old/libxslt-${PV}.tar.gz" +SRC_URI = "ftp://xmlsoft.org/libxml2/old/libxslt-${PV}.tar.gz" S = "${WORKDIR}/libxslt-${PV}" inherit autotools pkgconfig diff --git a/packages/libxslt/libxslt_1.1.8.bb b/packages/libxslt/libxslt_1.1.8.bb index 81d4fddead..fd81cba5d2 100644 --- a/packages/libxslt/libxslt_1.1.8.bb +++ b/packages/libxslt/libxslt_1.1.8.bb @@ -10,7 +10,7 @@ PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" FILES_${PN}-dev += "${bindir}/xslt-config" FILES_${PN}-utils += "${bindir}" -SRC_URI = "http://xmlsoft.org/sources/old/libxslt-${PV}.tar.gz" +SRC_URI = "ftp://xmlsoft.org/libxml2/old/libxslt-${PV}.tar.gz" S = "${WORKDIR}/libxslt-${PV}" inherit autotools pkgconfig diff --git a/packages/linux/ixp4xx-kernel/2.6.16/defconfig b/packages/linux/ixp4xx-kernel/2.6.16/defconfig index 8e374dae28..383b23c5e7 100644 --- a/packages/linux/ixp4xx-kernel/2.6.16/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.16/defconfig @@ -593,13 +593,13 @@ CONFIG_ATA_OVER_ETH=m # SCSI device support # # CONFIG_RAID_ATTRS is not set -CONFIG_SCSI=m +CONFIG_SCSI=y CONFIG_SCSI_PROC_FS=y # # SCSI support type (disk, tape, CD-ROM) # -CONFIG_BLK_DEV_SD=m +CONFIG_BLK_DEV_SD=y CONFIG_CHR_DEV_ST=m # CONFIG_CHR_DEV_OSST is not set CONFIG_BLK_DEV_SR=m @@ -1167,7 +1167,7 @@ CONFIG_VIDEO_CX88_ALSA=m # CONFIG_VIDEO_EM28XX is not set CONFIG_VIDEO_OVCAMCHIP=m # CONFIG_VIDEO_AUDIO_DECODER is not set -# CONFIG_VIDEO_DECODER is not set +CONFIG_VIDEO_DECODER=m # # Radio Adapters @@ -1302,14 +1302,14 @@ CONFIG_USB_DEVICEFS=y # # USB Host Controller Drivers # -CONFIG_USB_EHCI_HCD=m +CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_SPLIT_ISO=y CONFIG_USB_EHCI_ROOT_HUB_TT=y # CONFIG_USB_ISP116X_HCD is not set -CONFIG_USB_OHCI_HCD=m +CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OHCI_BIG_ENDIAN is not set CONFIG_USB_OHCI_LITTLE_ENDIAN=y -CONFIG_USB_UHCI_HCD=m +CONFIG_USB_UHCI_HCD=y # CONFIG_USB_SL811_HCD is not set # @@ -1326,7 +1326,7 @@ CONFIG_USB_PRINTER=m # # may also be needed; see USB_STORAGE Help for more information # -CONFIG_USB_STORAGE=m +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 @@ -1457,7 +1457,7 @@ CONFIG_USB_EZUSB=y # CONFIG_USB_AUERSWALD is not set # CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set -# CONFIG_USB_LCD is not set +CONFIG_USB_LCD=m # CONFIG_USB_LED is not set # CONFIG_USB_CYTHERM is not set # CONFIG_USB_PHIDGETKIT is not set diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb index bb6b50fd3d..0cf048ed72 100644 --- a/packages/linux/linux-openzaurus_2.6.16.bb +++ b/packages/linux/linux-openzaurus_2.6.16.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r3" +PR = "r4" DEFAULT_PREFERENCE = "-1" @@ -63,6 +63,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ ${RPSRC}/poodle_partsize-r0.patch;patch=1 \ ${RPSRC}/poodle_memsize-r0.patch;patch=1 \ ${RPSRC}/collie_frontlight-r1.patch;patch=1 \ + ${RPSRC}/zlib_inflate-r3.patch;patch=1 \ ${RPSRC}/pm_changes-r1.patch;patch=1 \ ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1 \ ${RPSRC}/usb_pxa27x_udc-r0.patch;patch=1 \ diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060329/.mtn2git_empty b/packages/pvrusb2-mci/pvrusb2-mci-20060329/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/pvrusb2-mci/pvrusb2-mci-20060329/.mtn2git_empty diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060329/Makefile.patch b/packages/pvrusb2-mci/pvrusb2-mci-20060329/Makefile.patch new file mode 100644 index 0000000000..29b1267177 --- /dev/null +++ b/packages/pvrusb2-mci/pvrusb2-mci-20060329/Makefile.patch @@ -0,0 +1,25 @@ +*** driver/Makefile- Tue Feb 28 21:05:41 2006 +--- driver/Makefile Tue Feb 28 21:07:15 2006 +*************** +*** 45,54 **** + M:=$(shell pwd) + + modules modules_install clean: +! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) CONFIG_VIDEO_PVRUSB2=m $@ + + install: +! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) CONFIG_VIDEO_PVRUSB2=m modules_install + + else + +--- 45,54 ---- + M:=$(shell pwd) + + modules modules_install clean: +! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) CONFIG_VIDEO_PVRUSB2=m $@ + + install: +! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) CONFIG_VIDEO_PVRUSB2=m modules_install + + else + diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb new file mode 100644 index 0000000000..0089bbc717 --- /dev/null +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" +PRIORITY = "optional" +SECTION = "kernel/modules" +MAINTAINER = "eFfeM <fransmeulenbroeks at yahoo dot com>" +LICENSE = "GPL" +PR = "r0" +RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887" + +SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \ + file://Makefile.patch;patch=1" + +S = "${WORKDIR}/pvrusb2-mci-${PV}/driver" + +inherit module + +CFLAGS = "'-I${KERNEL_SOURCE}/include' \ + '-I${KERNEL_SOURCE}/drivers/media/video' " + +CFLAGS_append_arm = " '-D__LINUX_ARM_ARCH__=5' " + +CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' " + +EXTRA_OEMAKE = "'V=1' '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_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media + install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media +} diff --git a/packages/ttf-fonts/ttf-dejavu_2.3.bb b/packages/ttf-fonts/ttf-dejavu_2.3.bb index d627574ac8..304b30cfd6 100644 --- a/packages/ttf-fonts/ttf-dejavu_2.3.bb +++ b/packages/ttf-fonts/ttf-dejavu_2.3.bb @@ -3,7 +3,6 @@ LICENSE = "Bitstream Vera" HOMEPAGE = "http://dejavu.sourceforge.net/wiki/index.php/Main_Page" MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>" -PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-ttf-${PV}-1.tar.gz" @@ -19,6 +18,3 @@ FILES_ttf-dejavu-sans-mono = "${datadir}/fonts/truetype/DejaVuSansMono*.tt FILES_ttf-dejavu-sans-condensed = "${datadir}/fonts/truetype/DejaVuSansCondensed*.ttf" FILES_ttf-dejavu-serif = "${datadir}/fonts/truetype/DejaVuSerif.ttf ${datadir}/fonts/truetype/DejaVuSerif-*.ttf" FILES_ttf-dejavu-serif-condensed = "${datadir}/fonts/truetype/DejaVuSerifCondensed*.ttf" - -RCONFLICTS_ttf-dejavu-sans-mono = "ttf-dejavu-sans-mono-lite" -RREPLACES_ttf-dejavu-sans-mono = "ttf-dejavu-sans-mono-lite" diff --git a/packages/ttf-fonts/ttf-gentium_1.02.bb b/packages/ttf-fonts/ttf-gentium_1.02.bb index 4ec03767f7..c9ad78448c 100644 --- a/packages/ttf-fonts/ttf-gentium_1.02.bb +++ b/packages/ttf-fonts/ttf-gentium_1.02.bb @@ -3,7 +3,7 @@ LICENSE = "SIL Open Font License" HOMEPAGE = "http://scripts.sil.org/gentium" LICENSE_URL = "http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=OFL" -SRC_URI = "${DEBIAN_MIRROR}/non-free/t/ttf-gentium/ttf-gentium_${PV}.orig.tar.gz \ +SRC_URI = "${DEBIAN_MIRROR}/main/t/ttf-gentium/ttf-gentium_${PV}.orig.tar.gz \ file://OFL.gz" include ttf.inc diff --git a/packages/udev/files/local.rules b/packages/udev/files/local.rules index 4bcaaa8aba..5f2efbeb0c 100644 --- a/packages/udev/files/local.rules +++ b/packages/udev/files/local.rules @@ -1,5 +1,22 @@ +# There are a number of modifiers that are allowed to be used in some +# of the different fields. They provide the following subsitutions: +# +# %n the "kernel number" of the device. +# For example, 'sda3' has a "kernel number" of '3' +# %e the smallest number for that name which does not matches an existing node +# %k the kernel name for the device +# %M the kernel major number for the device +# %m the kernel minor number for the device +# %b the bus id for the device +# %c the string returned by the PROGRAM +# %s{filename} the content of a sysfs attribute +# %% the '%' char itself +# + +# Media automounting SUBSYSTEM=="block", ACTION=="add" RUN+="/etc/udev/scripts/mount.sh" SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh" +# Handle network interface setup SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh" SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh" diff --git a/packages/udev/files/udev.rules b/packages/udev/files/udev.rules index 044ababa7f..5c566f6cef 100644 --- a/packages/udev/files/udev.rules +++ b/packages/udev/files/udev.rules @@ -28,7 +28,7 @@ BUS=="usb", KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", \ # usbfs-like devices SUBSYSTEM=="usb_device", \ - PROGRAM="/bin/sh -c 'X=%k X=$${X#usbdev} B=$${X%%%%.*} D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c" + PROGRAM="/bin/sh -c 'export X=%k; export X=$${X#usbdev}; export B=$${X%%%%.*}; export D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c" # serial devices KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20" diff --git a/packages/udev/udev-084/local.rules b/packages/udev/udev-084/local.rules new file mode 100644 index 0000000000..bb8459ba23 --- /dev/null +++ b/packages/udev/udev-084/local.rules @@ -0,0 +1,28 @@ +# There are a number of modifiers that are allowed to be used in some +# of the different fields. They provide the following subsitutions: +# +# %n the "kernel number" of the device. +# For example, 'sda3' has a "kernel number" of '3' +# %e the smallest number for that name which does not matches an existing node +# %k the kernel name for the device +# %M the kernel major number for the device +# %m the kernel minor number for the device +# %b the bus id for the device +# %c the string returned by the PROGRAM +# %s{filename} the content of a sysfs attribute +# %% the '%' char itself +# + +# Media automounting +SUBSYSTEM=="block", ACTION=="add" RUN+="/etc/udev/scripts/mount.sh" +SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh" + +# Handle network interface setup +SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh" +SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh" + +# The first rtc device is symlinked to /dev/rtc +KERNEL="rtc0", SYMLINK="rtc" + +# Try and modprobe for drivers for new hardware +ACTION="add", DEVPATH="/devices/*", MODALIAS=="?*", RUN+="/sbin/modprobe $modalias" diff --git a/packages/udev/udev-084/udev.rules b/packages/udev/udev-084/udev.rules index 098b16bc4f..7b4152c5bf 100644 --- a/packages/udev/udev-084/udev.rules +++ b/packages/udev/udev-084/udev.rules @@ -28,7 +28,7 @@ BUS=="usb", KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", \ # usbfs-like devices SUBSYSTEM=="usb_device", \ - PROGRAM="/bin/sh -c 'X=%k X=$${X#usbdev} B=$${X%%%%.*} D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c" + PROGRAM="/bin/sh -c 'export X=%k; export X=$${X#usbdev}; export B=$${X%%%%.*}; export D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c" # serial devices KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20" @@ -96,6 +96,3 @@ KERNEL="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660" # Firmware Helper ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper" - -# on ARM we get /dev/rtc0 but many apps need /dev/rtc -KERNEL=="rtc0" NAME="rtc0" SYMLINK="rtc" diff --git a/packages/udev/udev_084.bb b/packages/udev/udev_084.bb index e1db0ccd79..6bafa615d7 100644 --- a/packages/udev/udev_084.bb +++ b/packages/udev/udev_084.bb @@ -13,7 +13,7 @@ include udev.inc INITSCRIPT_PARAMS = "start 03 S . start 55 0 6 ." -PR = "r2" +PR = "r3" FILES_${PN} += "${base_libdir}" UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" |