From 09c194e7c38cf564b4948a711f81b671f87ae3a8 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 23 Nov 2007 19:54:17 +0000 Subject: klibc 1.1.1: Fix multimachine build. * klibc fishes in kernel sources, and this is per-machine stuff, so klibc must be per-machine too. This is of course not ideal, as klibc is *not* machine-dependent, but at least it's on par with uclibc, which has the same issue. --- packages/klibc/klibc.inc | 1 + packages/klibc/klibc_1.1.1.bb | 2 ++ 2 files changed, 3 insertions(+) (limited to 'packages') diff --git a/packages/klibc/klibc.inc b/packages/klibc/klibc.inc index 0ddcef82d9..a7f0094264 100644 --- a/packages/klibc/klibc.inc +++ b/packages/klibc/klibc.inc @@ -7,6 +7,7 @@ LICENSE = "BSD-ADV" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/Stable/klibc-${PV}.tar.bz2" SRC_URI += "file://install.patch;patch=1" S = "${WORKDIR}/klibc-${PV}" +PACKAGE_ARCH = "${MACHINE_ARCH}" # for the correct kernel staging path # inherit module-base diff --git a/packages/klibc/klibc_1.1.1.bb b/packages/klibc/klibc_1.1.1.bb index cd1ba9d56e..ff715765d5 100644 --- a/packages/klibc/klibc_1.1.1.bb +++ b/packages/klibc/klibc_1.1.1.bb @@ -1 +1,3 @@ require klibc.inc + +PR = "r1" -- cgit v1.2.3 From 9eb6a7f466f0013ca185ae6708c4d127773f3b6a Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 23 Nov 2007 20:21:50 +0000 Subject: linux-handhelds-2.6: Fix another typo in HaRET startup script. --- packages/linux/linux-handhelds-2.6.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc index 66179209e1..6a37548342 100644 --- a/packages/linux/linux-handhelds-2.6.inc +++ b/packages/linux/linux-handhelds-2.6.inc @@ -83,7 +83,7 @@ set kernel "${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}" # 2nd - EXT2 with rootfs tarball extracted set cmdline "root=/dev/mmcblk0p2 rootdelay=10 console=ttyS0,115200n8 console=tty0" -## Choice 2 - Boot from CD card, setup like above +## Choice 2 - Boot from CF card, setup like above #set cmdline "root=/dev/hda2 rootdelay=10 console=ttyS0,115200n8 console=tty0" ## Choice 3 - Boot rootfs image as initramfs (works only for smaller images) -- cgit v1.2.3 From ab3c6b224773dc828db4d4d354bcb8395d04c719 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 24 Nov 2007 12:11:21 +0000 Subject: linux-handhelds-2.6: Factor out kernel filename to a variable, for easy global change. --- packages/linux/linux-handhelds-2.6.inc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc index 6a37548342..f58ef672aa 100644 --- a/packages/linux/linux-handhelds-2.6.inc +++ b/packages/linux/linux-handhelds-2.6.inc @@ -23,6 +23,8 @@ HHV ?= "${@bb.data.getVar('PV',d,1).split('-')[1].split('hh')[-1]}" KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}" +KERNEL_FILENAME = "${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}" + do_configure() { if [ `grep EXTRAVERSION Makefile | grep hh | awk '{print $3}' | sed s/-hh//` != ${HHV} ]; then @@ -54,12 +56,12 @@ do_configure() { do_deploy() { install -d ${DEPLOY_DIR_IMAGE} - install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_FILENAME} #reflash.ctl is required to reflash using bootldr # format: # name file md5sumfile destination - echo "${MACHINE}-kernel-${DATETIME} ${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} - kernel" >> ${DEPLOY_DIR_IMAGE}/reflash.ctl + echo "${MACHINE}-kernel-${DATETIME} ${KERNEL_FILENAME} - kernel" >> ${DEPLOY_DIR_IMAGE}/reflash.ctl gen_haret_startup } @@ -73,7 +75,7 @@ gen_haret_startup() { # This is startup file for HaRET, Linux bootloader for WinCE # http://handhelds.org/wiki/HaRET -set kernel "${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}" +set kernel "${KERNEL_FILENAME}" # Boot choices. Uncomment 'set' statements in exactly one section -- cgit v1.2.3 From e25f7b921088be5bf785372d4b76dad40f74baa7 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 24 Nov 2007 12:14:59 +0000 Subject: initramfs-module-bootmenu: Switch from using buggy mount --guess-fstype to buggy klibc's fstype. --- packages/initrdscripts/files/30-bootmenu.sh | 8 +++++++- packages/initrdscripts/initramfs-module-bootmenu_1.0.bb | 5 +++-- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/initrdscripts/files/30-bootmenu.sh b/packages/initrdscripts/files/30-bootmenu.sh index 5b3e7782f4..1bb53d20a3 100644 --- a/packages/initrdscripts/files/30-bootmenu.sh +++ b/packages/initrdscripts/files/30-bootmenu.sh @@ -1,3 +1,7 @@ +# +# (c) 2007 Paul Sokolovsky +# + # If root is explicitly specified, skip interactive selection if [ -z "$ROOT_DEVICE" ]; then ############################## @@ -52,7 +56,9 @@ get_menu_selection() get_partition_type() { - fstype=`mount -f --guess-fstype /dev/$dev $MOUNTLOC` +# fstype=`mount -f --guess-fstype /dev/$dev $MOUNTLOC` + fstype=`fstype Date: Sat, 24 Nov 2007 15:34:07 +0000 Subject: klibc-utils-fstype: Create a separate recipe for klibc's fstype. * ... built against normal system libc. --- packages/klibc/files/fstype-sane-and-vfat.patch | 60 +++++++++++++++++++++++++ packages/klibc/klibc-utils-fstype_1.1.1.bb | 14 ++++++ 2 files changed, 74 insertions(+) create mode 100644 packages/klibc/files/fstype-sane-and-vfat.patch create mode 100644 packages/klibc/klibc-utils-fstype_1.1.1.bb (limited to 'packages') diff --git a/packages/klibc/files/fstype-sane-and-vfat.patch b/packages/klibc/files/fstype-sane-and-vfat.patch new file mode 100644 index 0000000000..7b7674637a --- /dev/null +++ b/packages/klibc/files/fstype-sane-and-vfat.patch @@ -0,0 +1,60 @@ +Patch to compile fstype util against "normal" libc (glibc/uclicb), and to +add vfat detection. + +--- klibc-1.1.1/utils/fstype.c.org 2005-09-06 23:49:34.000000000 +0300 ++++ klibc-1.1.1/utils/fstype.c 2007-11-24 01:07:26.000000000 +0200 +@@ -13,11 +13,18 @@ + */ + + #include ++#include + #include + #include + #include + #include + #include ++#if __BYTE_ORDER == __BIG_ENDIAN ++#include ++#else ++#include ++#endif ++ + + #define cpu_to_be32(x) __cpu_to_be32(x) /* Needed by romfs_fs.h */ + +@@ -105,6 +112,18 @@ + return 0; + } + ++static int vfat_image(const unsigned char *buf, unsigned long *blocks) ++{ ++ const struct romfs_super_block *sb = ++ (const struct romfs_super_block *)buf; ++ if (!strncmp(buf + 54, "FAT12 ", 8) ++ || !strncmp(buf + 54, "FAT16 ", 8) ++ || !strncmp(buf + 82, "FAT32 ", 8)) ++ return 1; ++ ++ return 0; ++} ++ + static int minix_image(const unsigned char *buf, unsigned long *blocks) + { + const struct minix_super_block *sb = +@@ -167,8 +186,6 @@ + (const struct xfs_sb *)buf; + + if (__be32_to_cpu(sb->sb_magicnum) == XFS_SB_MAGIC) { +- *blocks = __be64_to_cpu(sb->sb_dblocks) * +- (__be32_to_cpu(sb->sb_blocksize) / BLOCK_SIZE); + return 1; + } + return 0; +@@ -184,6 +201,7 @@ + { 0, "gzip", gzip_image }, + { 0, "cramfs", cramfs_image }, + { 0, "romfs", romfs_image }, ++ { 0, "vfat", vfat_image }, + { 0, "xfs", xfs_image }, + { 1, "minix", minix_image }, + { 1, "ext3", ext3_image }, diff --git a/packages/klibc/klibc-utils-fstype_1.1.1.bb b/packages/klibc/klibc-utils-fstype_1.1.1.bb new file mode 100644 index 0000000000..29ce38285c --- /dev/null +++ b/packages/klibc/klibc-utils-fstype_1.1.1.bb @@ -0,0 +1,14 @@ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/Stable/klibc-${PV}.tar.bz2" +SRC_URI += "file://fstype-sane-and-vfat.patch;patch=1" +PR = "r0" + +S = "${WORKDIR}/klibc-${PV}" + +do_compile() { + ${CC} -o fstype utils/fstype.c -static +} + +do_install () { + install -d ${D}${bindir} + install -m 0755 fstype ${D}${bindir}/ +} -- cgit v1.2.3 From 6455c691e7d17a65938ac633c63c170aae9c9da2 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 24 Nov 2007 16:14:00 +0000 Subject: initramfs-uniboot & modules: These all are machine-independent scripts. --- packages/initrdscripts/initramfs-jffs2_0.1.bb | 3 ++- packages/initrdscripts/initramfs-module-block_1.0.bb | 3 ++- packages/initrdscripts/initramfs-module-initfs_1.0.bb | 3 ++- packages/initrdscripts/initramfs-module-loop_1.0.bb | 3 ++- packages/initrdscripts/initramfs-module-nfs_1.0.bb | 3 ++- packages/initrdscripts/initramfs-uniboot_1.0.bb | 5 ++--- 6 files changed, 12 insertions(+), 8 deletions(-) (limited to 'packages') diff --git a/packages/initrdscripts/initramfs-jffs2_0.1.bb b/packages/initrdscripts/initramfs-jffs2_0.1.bb index 3e11465536..f938b9d3b1 100644 --- a/packages/initrdscripts/initramfs-jffs2_0.1.bb +++ b/packages/initrdscripts/initramfs-jffs2_0.1.bb @@ -1,8 +1,9 @@ SRC_URI = "file://jffs2boot.sh" -PR = "r1" +PR = "r2" do_install() { install -m 0755 ${WORKDIR}/jffs2boot.sh ${D}/init } +PACKAGE_ARCH = "all" FILES_${PN} += " /init " diff --git a/packages/initrdscripts/initramfs-module-block_1.0.bb b/packages/initrdscripts/initramfs-module-block_1.0.bb index 73f7a709f1..72812a2490 100644 --- a/packages/initrdscripts/initramfs-module-block_1.0.bb +++ b/packages/initrdscripts/initramfs-module-block_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://85-blockboot.sh" -PR = "r0" +PR = "r1" RDEPENDS = "initramfs-uniboot" DESCRIPTION = "An initramfs module for booting off normal block devices." @@ -8,4 +8,5 @@ do_install() { install -m 0755 ${WORKDIR}/85-blockboot.sh ${D}/initrd.d/ } +PACKAGE_ARCH = "all" FILES_${PN} += " /initrd.d/* " diff --git a/packages/initrdscripts/initramfs-module-initfs_1.0.bb b/packages/initrdscripts/initramfs-module-initfs_1.0.bb index 48ae6c2160..64bba4a304 100644 --- a/packages/initrdscripts/initramfs-module-initfs_1.0.bb +++ b/packages/initrdscripts/initramfs-module-initfs_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://10-initfs.sh" -PR = "r1" +PR = "r2" DESCRIPTION = "An initramfs module for initializing filesystems." RDEPENDS = "initramfs-uniboot" RRECOMMENDS = "kernel-module-vfat kernel-module-ext2" @@ -9,4 +9,5 @@ do_install() { install -m 0755 ${WORKDIR}/10-initfs.sh ${D}/initrd.d/ } +PACKAGE_ARCH = "all" FILES_${PN} += " /initrd.d/* " diff --git a/packages/initrdscripts/initramfs-module-loop_1.0.bb b/packages/initrdscripts/initramfs-module-loop_1.0.bb index 5cc84bcaf8..1a2d0a9754 100644 --- a/packages/initrdscripts/initramfs-module-loop_1.0.bb +++ b/packages/initrdscripts/initramfs-module-loop_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://80-loopboot.sh" -PR = "r1" +PR = "r2" DESCRIPTION = "An initramfs module for booting a filesystem image by loopback \ mounting it." RDEPENDS = "initramfs-uniboot initramfs-module-initfs" @@ -10,4 +10,5 @@ do_install() { install -m 0755 ${WORKDIR}/80-loopboot.sh ${D}/initrd.d/ } +PACKAGE_ARCH = "all" FILES_${PN} += " /initrd.d/* " diff --git a/packages/initrdscripts/initramfs-module-nfs_1.0.bb b/packages/initrdscripts/initramfs-module-nfs_1.0.bb index 6555688fce..acf71adb92 100644 --- a/packages/initrdscripts/initramfs-module-nfs_1.0.bb +++ b/packages/initrdscripts/initramfs-module-nfs_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://80-nfsboot.sh" -PR = "r0" +PR = "r1" DESCRIPTION = "An initramfs module for booting via NFS." RDEPENDS = "initramfs-uniboot" RRECOMMENDS = "kernel-module-g-ether kernel-module-nfs" @@ -9,4 +9,5 @@ do_install() { install -m 0755 ${WORKDIR}/80-nfsboot.sh ${D}/initrd.d/ } +PACKAGE_ARCH = "all" FILES_${PN} += " /initrd.d/nfs " diff --git a/packages/initrdscripts/initramfs-uniboot_1.0.bb b/packages/initrdscripts/initramfs-uniboot_1.0.bb index f8d9d76936..167ce71ffe 100644 --- a/packages/initrdscripts/initramfs-uniboot_1.0.bb +++ b/packages/initrdscripts/initramfs-uniboot_1.0.bb @@ -1,11 +1,10 @@ SRC_URI = "file://init.sh" -PR = "r0" +PR = "r2" DESCRIPTON = "A modular initramfs init script system." -RDEPENDS = "busybox-static" -RRECOMMENDS = "kernel-module-uinput" do_install() { install -m 0755 ${WORKDIR}/init.sh ${D}/init } +PACKAGE_ARCH = "all" FILES_${PN} += " /init " -- cgit v1.2.3 From 5c0f56e18d6f0fa9b7afb22b6c274b7e54dd38a1 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sat, 24 Nov 2007 17:06:32 +0000 Subject: busybox: SlugOS defconfig - add nohup, add timeout option to shell's read command. --- packages/busybox/busybox-1.2.1/slugos/defconfig | 6 +++--- packages/busybox/busybox_1.2.1.bb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/busybox/busybox-1.2.1/slugos/defconfig b/packages/busybox/busybox-1.2.1/slugos/defconfig index c76954e711..74ece9c3b6 100644 --- a/packages/busybox/busybox-1.2.1/slugos/defconfig +++ b/packages/busybox/busybox-1.2.1/slugos/defconfig @@ -171,7 +171,7 @@ CONFIG_MKNOD=y CONFIG_MV=y # CONFIG_FEATURE_MV_LONG_OPTIONS is not set # CONFIG_NICE is not set -# CONFIG_NOHUP is not set +CONFIG_NOHUP=y CONFIG_OD=y # CONFIG_PRINTENV is not set CONFIG_PRINTF=y @@ -595,8 +595,8 @@ CONFIG_ASH=y # Ash Shell Options # CONFIG_ASH_JOB_CONTROL=y -# CONFIG_ASH_READ_NCHARS is not set -# CONFIG_ASH_READ_TIMEOUT is not set +CONFIG_ASH_READ_NCHARS=y +CONFIG_ASH_READ_TIMEOUT=y CONFIG_ASH_ALIAS=y CONFIG_ASH_MATH_SUPPORT=y # CONFIG_ASH_MATH_SUPPORT_64 is not set diff --git a/packages/busybox/busybox_1.2.1.bb b/packages/busybox/busybox_1.2.1.bb index 64a6000747..325111c22f 100644 --- a/packages/busybox/busybox_1.2.1.bb +++ b/packages/busybox/busybox_1.2.1.bb @@ -1,6 +1,6 @@ require busybox.inc -PR = "r14" +PR = "r15" SRC_URI += "file://wget-long-options.patch;patch=1 \ file://df_rootfs.patch;patch=1 \ -- cgit v1.2.3 From 2082789e52e0b43efd6f41cb394514241733e6ec Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sat, 24 Nov 2007 17:10:21 +0000 Subject: ixp4xx-kernel: defconfig for 2.6.21.6 - add many crypt modules, add requested cdc modules, and add various USB video device modules. (note: no built-in devices or crypto drivers have been changed to modules in this commit) --- packages/linux/ixp4xx-kernel/2.6.21/defconfig | 100 ++++++++++++++++---------- packages/linux/ixp4xx-kernel_2.6.21.6.bb | 2 +- 2 files changed, 64 insertions(+), 38 deletions(-) (limited to 'packages') diff --git a/packages/linux/ixp4xx-kernel/2.6.21/defconfig b/packages/linux/ixp4xx-kernel/2.6.21/defconfig index 921ab991c9..42527b3dfc 100644 --- a/packages/linux/ixp4xx-kernel/2.6.21/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.21/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21 -# Wed Nov 21 03:10:50 2007 +# Thu Nov 22 23:05:47 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -243,6 +243,7 @@ CONFIG_FPE_NWFPE=y CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_AOUT is not set # CONFIG_BINFMT_MISC is not set +# CONFIG_ARTHUR is not set # # Power management options @@ -502,6 +503,9 @@ CONFIG_IPDDP_DECAP=y # QoS and/or fair queueing # # CONFIG_NET_SCHED is not set +# CONFIG_NET_SCH_CLK_JIFFIES is not set +# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set +# CONFIG_NET_SCH_CLK_CPU is not set CONFIG_NET_CLS_ROUTE=y # @@ -529,8 +533,8 @@ CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y CONFIG_BT_HCIBCM203X=m -# CONFIG_BT_HCIBPA10X is not set -# CONFIG_BT_HCIBFUSB is not set +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m CONFIG_BT_HCIVHCI=m CONFIG_IEEE80211=m # CONFIG_IEEE80211_DEBUG is not set @@ -1317,12 +1321,20 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y CONFIG_VIDEO_TDA9840=m CONFIG_VIDEO_TEA6415C=m CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_WM8775=m CONFIG_VIDEO_BT819=m CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_OV7670=m CONFIG_VIDEO_SAA7110=m CONFIG_VIDEO_SAA7111=m CONFIG_VIDEO_SAA7114=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TVP5150=m CONFIG_VIDEO_VPX3220=m +CONFIG_VIDEO_CX25840=m +CONFIG_VIDEO_CX2341X=m CONFIG_VIDEO_SAA7185=m CONFIG_VIDEO_ADV7170=m CONFIG_VIDEO_ADV7175=m @@ -1342,36 +1354,41 @@ CONFIG_VIDEO_ZORAN_DC10=m CONFIG_VIDEO_ZORAN_DC30=m CONFIG_VIDEO_ZORAN_LML33=m CONFIG_VIDEO_ZORAN_LML33R10=m -# CONFIG_VIDEO_ZORAN_AVS6EYES is not set +CONFIG_VIDEO_ZORAN_AVS6EYES=m CONFIG_VIDEO_SAA7134=m -# CONFIG_VIDEO_SAA7134_ALSA is not set +CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_MXB=m CONFIG_VIDEO_DPC=m CONFIG_VIDEO_HEXIUM_ORION=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_CX88=m CONFIG_VIDEO_CX88_ALSA=m -# CONFIG_VIDEO_CX88_BLACKBIRD is not set -# CONFIG_VIDEO_CAFE_CCIC is not set +CONFIG_VIDEO_CX88_BLACKBIRD=m +CONFIG_VIDEO_CAFE_CCIC=m # # V4L USB devices # -# CONFIG_VIDEO_PVRUSB2 is not set -# CONFIG_VIDEO_EM28XX is not set -# CONFIG_VIDEO_USBVISION is not set -# CONFIG_USB_VICAM is not set -# CONFIG_USB_IBMCAM is not set -# CONFIG_USB_KONICAWC is not set -# CONFIG_USB_QUICKCAM_MESSENGER is not set -# CONFIG_USB_ET61X251 is not set +CONFIG_VIDEO_PVRUSB2=m +CONFIG_VIDEO_PVRUSB2_29XXX=y +CONFIG_VIDEO_PVRUSB2_24XXX=y +CONFIG_VIDEO_PVRUSB2_SYSFS=y +# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_USBVIDEO=m +CONFIG_USB_VICAM=m +CONFIG_USB_IBMCAM=m +CONFIG_USB_KONICAWC=m +CONFIG_USB_QUICKCAM_MESSENGER=m +CONFIG_USB_ET61X251=m CONFIG_VIDEO_OVCAMCHIP=m -# CONFIG_USB_W9968CF is not set -# CONFIG_USB_OV511 is not set -# CONFIG_USB_SE401 is not set -# CONFIG_USB_SN9C102 is not set -# CONFIG_USB_STV680 is not set -# CONFIG_USB_ZC0301 is not set +CONFIG_USB_W9968CF=m +CONFIG_USB_OV511=m +CONFIG_USB_SE401=m +CONFIG_USB_SN9C102=m +CONFIG_USB_STV680=m +CONFIG_USB_ZC0301=m CONFIG_USB_PWC=m # CONFIG_USB_PWC_DEBUG is not set @@ -1381,7 +1398,7 @@ CONFIG_USB_PWC=m # CONFIG_RADIO_GEMTEK_PCI is not set # CONFIG_RADIO_MAXIRADIO is not set # CONFIG_RADIO_MAESTRO is not set -# CONFIG_USB_DSBR is not set +CONFIG_USB_DSBR=m # # Digital Video Broadcasting Devices @@ -1415,11 +1432,13 @@ CONFIG_SND_TIMER=m CONFIG_SND_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m -# CONFIG_SND_SEQUENCER is not set +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m CONFIG_SND_OSSEMUL=y CONFIG_SND_MIXER_OSS=m CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y +# CONFIG_SND_SEQUENCER_OSS is not set # CONFIG_SND_DYNAMIC_MINORS is not set CONFIG_SND_SUPPORT_OLD_API=y CONFIG_SND_VERBOSE_PROCFS=y @@ -1430,6 +1449,7 @@ CONFIG_SND_VERBOSE_PROCFS=y # Generic devices # # CONFIG_SND_DUMMY is not set +# CONFIG_SND_VIRMIDI is not set # CONFIG_SND_MTPAV is not set # CONFIG_SND_SERIAL_U16550 is not set # CONFIG_SND_MPU401 is not set @@ -1567,7 +1587,7 @@ CONFIG_USB_PRINTER=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 +CONFIG_USB_STORAGE_FREECOM=y # CONFIG_USB_STORAGE_DPCM is not set # CONFIG_USB_STORAGE_USBAT is not set # CONFIG_USB_STORAGE_SDDR09 is not set @@ -1599,9 +1619,9 @@ CONFIG_USB_KBD=m # CONFIG_USB_TOUCHSCREEN is not set CONFIG_USB_YEALINK=m # CONFIG_USB_XPAD is not set -# CONFIG_USB_ATI_REMOTE is not set -# CONFIG_USB_ATI_REMOTE2 is not set -# CONFIG_USB_KEYSPAN_REMOTE is not set +CONFIG_USB_ATI_REMOTE=m +CONFIG_USB_ATI_REMOTE2=m +CONFIG_USB_KEYSPAN_REMOTE=m # CONFIG_USB_APPLETOUCH is not set # CONFIG_USB_GTCO is not set @@ -1622,13 +1642,19 @@ CONFIG_USB_USBNET_MII=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m -# CONFIG_USB_NET_DM9601 is not set -# CONFIG_USB_NET_GL620A is not set +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_GL620A=m CONFIG_USB_NET_NET1080=m -# CONFIG_USB_NET_PLUSB is not set +CONFIG_USB_NET_PLUSB=m CONFIG_USB_NET_MCS7830=m -# CONFIG_USB_NET_RNDIS_HOST is not set -# CONFIG_USB_NET_CDC_SUBSET is not set +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +CONFIG_USB_EPSON2888=y +CONFIG_USB_KC2190=y CONFIG_USB_NET_ZAURUS=m # CONFIG_USB_MON is not set @@ -1699,11 +1725,11 @@ CONFIG_USB_EZUSB=y # CONFIG_USB_EMI26 is not set CONFIG_USB_ADUTUX=m # 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_BERRY_CHARGE is not set -# CONFIG_USB_LED is not set +CONFIG_USB_RIO500=m +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_BERRY_CHARGE=m +CONFIG_USB_LED=m # CONFIG_USB_CYPRESS_CY7C63 is not set # CONFIG_USB_CYTHERM is not set CONFIG_USB_PHIDGET=m diff --git a/packages/linux/ixp4xx-kernel_2.6.21.6.bb b/packages/linux/ixp4xx-kernel_2.6.21.6.bb index a9bacace21..e943cb47be 100644 --- a/packages/linux/ixp4xx-kernel_2.6.21.6.bb +++ b/packages/linux/ixp4xx-kernel_2.6.21.6.bb @@ -16,7 +16,7 @@ IXP4XX_KERNEL_PATCH_DIR = "2.6.21" # the changes in SVN between revisions include changes in the # patches applied to the kernel, rather than simply defconfig # changes -PR = "r1.${IXP4XX_KERNEL_SVN_REV}" +PR = "r2.${IXP4XX_KERNEL_SVN_REV}" require ixp4xx-kernel.inc require ixp4xx-kernel-svnpatch.inc -- cgit v1.2.3 From 5b56ea8960f47f11fd7923abeb938fc57c84942e Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 25 Nov 2007 22:43:28 +0000 Subject: keylaunch 2.0.10: Separate a keylaunch, a generic X key binding utility, from random crap aka device-specific (mis)configs and hacks. --- packages/keylaunch/files/80chvt-SUID | 25 ---------------- packages/keylaunch/files/akita/.mtn2git_empty | 0 packages/keylaunch/files/akita/keylaunchrc | 28 ------------------ packages/keylaunch/files/c7x0/.mtn2git_empty | 0 packages/keylaunch/files/c7x0/keylaunchrc | 6 ---- packages/keylaunch/files/collie/.mtn2git_empty | 0 packages/keylaunch/files/collie/keylaunchrc | 0 packages/keylaunch/files/corgie/.mtn2git_empty | 0 packages/keylaunch/files/corgie/keylaunchrc | 6 ---- packages/keylaunch/files/husky/.mtn2git_empty | 0 packages/keylaunch/files/husky/keylaunchrc | 6 ---- packages/keylaunch/files/keylaunchrc | 8 ----- packages/keylaunch/files/shepherd/.mtn2git_empty | 0 packages/keylaunch/files/shepherd/keylaunchrc | 6 ---- packages/keylaunch/files/spitz/.mtn2git_empty | 0 packages/keylaunch/files/spitz/keylaunchrc | 28 ------------------ packages/keylaunch/keylaunch-conf/.mtn2git_empty | 0 packages/keylaunch/keylaunch-conf/80chvt-SUID | 25 ++++++++++++++++ .../keylaunch/keylaunch-conf/akita/.mtn2git_empty | 0 .../keylaunch/keylaunch-conf/akita/keylaunchrc | 28 ++++++++++++++++++ .../keylaunch/keylaunch-conf/c7x0/.mtn2git_empty | 0 packages/keylaunch/keylaunch-conf/c7x0/keylaunchrc | 6 ++++ .../keylaunch/keylaunch-conf/collie/.mtn2git_empty | 0 .../keylaunch/keylaunch-conf/collie/keylaunchrc | 0 .../keylaunch/keylaunch-conf/corgie/.mtn2git_empty | 0 .../keylaunch/keylaunch-conf/corgie/keylaunchrc | 6 ++++ .../keylaunch/keylaunch-conf/husky/.mtn2git_empty | 0 .../keylaunch/keylaunch-conf/husky/keylaunchrc | 6 ++++ packages/keylaunch/keylaunch-conf/keylaunchrc | 8 +++++ .../keylaunch-conf/shepherd/.mtn2git_empty | 0 .../keylaunch/keylaunch-conf/shepherd/keylaunchrc | 6 ++++ .../keylaunch/keylaunch-conf/spitz/.mtn2git_empty | 0 .../keylaunch/keylaunch-conf/spitz/keylaunchrc | 28 ++++++++++++++++++ packages/keylaunch/keylaunch-conf_2.0.10.bb | 27 +++++++++++++++++ packages/keylaunch/keylaunch_2.0.10.bb | 34 +++++----------------- 35 files changed, 147 insertions(+), 140 deletions(-) delete mode 100644 packages/keylaunch/files/80chvt-SUID delete mode 100644 packages/keylaunch/files/akita/.mtn2git_empty delete mode 100644 packages/keylaunch/files/akita/keylaunchrc delete mode 100644 packages/keylaunch/files/c7x0/.mtn2git_empty delete mode 100644 packages/keylaunch/files/c7x0/keylaunchrc delete mode 100644 packages/keylaunch/files/collie/.mtn2git_empty delete mode 100644 packages/keylaunch/files/collie/keylaunchrc delete mode 100644 packages/keylaunch/files/corgie/.mtn2git_empty delete mode 100644 packages/keylaunch/files/corgie/keylaunchrc delete mode 100644 packages/keylaunch/files/husky/.mtn2git_empty delete mode 100644 packages/keylaunch/files/husky/keylaunchrc delete mode 100644 packages/keylaunch/files/keylaunchrc delete mode 100644 packages/keylaunch/files/shepherd/.mtn2git_empty delete mode 100644 packages/keylaunch/files/shepherd/keylaunchrc delete mode 100644 packages/keylaunch/files/spitz/.mtn2git_empty delete mode 100644 packages/keylaunch/files/spitz/keylaunchrc create mode 100644 packages/keylaunch/keylaunch-conf/.mtn2git_empty create mode 100644 packages/keylaunch/keylaunch-conf/80chvt-SUID create mode 100644 packages/keylaunch/keylaunch-conf/akita/.mtn2git_empty create mode 100644 packages/keylaunch/keylaunch-conf/akita/keylaunchrc create mode 100644 packages/keylaunch/keylaunch-conf/c7x0/.mtn2git_empty create mode 100644 packages/keylaunch/keylaunch-conf/c7x0/keylaunchrc create mode 100644 packages/keylaunch/keylaunch-conf/collie/.mtn2git_empty create mode 100644 packages/keylaunch/keylaunch-conf/collie/keylaunchrc create mode 100644 packages/keylaunch/keylaunch-conf/corgie/.mtn2git_empty create mode 100644 packages/keylaunch/keylaunch-conf/corgie/keylaunchrc create mode 100644 packages/keylaunch/keylaunch-conf/husky/.mtn2git_empty create mode 100644 packages/keylaunch/keylaunch-conf/husky/keylaunchrc create mode 100644 packages/keylaunch/keylaunch-conf/keylaunchrc create mode 100644 packages/keylaunch/keylaunch-conf/shepherd/.mtn2git_empty create mode 100644 packages/keylaunch/keylaunch-conf/shepherd/keylaunchrc create mode 100644 packages/keylaunch/keylaunch-conf/spitz/.mtn2git_empty create mode 100644 packages/keylaunch/keylaunch-conf/spitz/keylaunchrc create mode 100644 packages/keylaunch/keylaunch-conf_2.0.10.bb (limited to 'packages') diff --git a/packages/keylaunch/files/80chvt-SUID b/packages/keylaunch/files/80chvt-SUID deleted file mode 100644 index e3b4efef5d..0000000000 --- a/packages/keylaunch/files/80chvt-SUID +++ /dev/null @@ -1,25 +0,0 @@ -#! /bin/sh -# -# Copyright Matthias Hentges (c) 2006 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) -# -# Filename: chvt-SUID.sh -# Date: 28-May-06 - - -# -# Sets the SUID bit on chvt to allow changing to the VT from inside X by -# any user. Since a SUID binary still is a security risk, we chmod only -# when keylaunch is used and not by default. -# - -for target in /usr/bin/chvt.console-tools -do - if test "`ls -l "$target" | awk '{print $1}'|cut -c 2-4`" != "rws" - then - echo "Making [$target] SUID root..." - chmod u+s "$target" - else - echo "Ignoring [$target]" - fi -done diff --git a/packages/keylaunch/files/akita/.mtn2git_empty b/packages/keylaunch/files/akita/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/keylaunch/files/akita/keylaunchrc b/packages/keylaunch/files/akita/keylaunchrc deleted file mode 100644 index 9bb64db066..0000000000 --- a/packages/keylaunch/files/akita/keylaunchrc +++ /dev/null @@ -1,28 +0,0 @@ -key=....F9:-:gpe-calendar -key=....F10:-:gpe-contacts -key=....F13:-:sylpheed -key=....F12:-:~matchbox-remote -next -key=...*F12:-:~matchbox-remote -desktop -key=....F11:-:~matchbox-remote -menu -#key=...*1:-:~zoom out -#key=...*2:-:~zoom in -key=...*3:-:~display-brightness.sh down -key=...*4:-:~display-brightness.sh up - -# LCD Softkeys -# Please note that the space _between_ two softkeys can be used, too ;) -#key=....F20:-: -key=....F21:-:~matchbox-remote -next -#key=....F22:-: -key=....F23:-:sylpheed -#key=....F24:-: -key=....F25:-:gpe-contacts -#key=....F26:-: -key=....F27:-:gpe-calendar -#key=....F28:-: -#key=....F29:-: -#key=....F30:-: - -# VT changing -key=...*Left:-:~chvt 1 -key=...*Right:-:~chvt 3 diff --git a/packages/keylaunch/files/c7x0/.mtn2git_empty b/packages/keylaunch/files/c7x0/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/keylaunch/files/c7x0/keylaunchrc b/packages/keylaunch/files/c7x0/keylaunchrc deleted file mode 100644 index e0b729a508..0000000000 --- a/packages/keylaunch/files/c7x0/keylaunchrc +++ /dev/null @@ -1,6 +0,0 @@ -key=....F9:-:gpe-calendar -key=....F10:-:gpe-contacts -key=....F13:-:sylpheed -key=....F12:-:gpe-mini-browser -key=...*F18:-:display-brightness.sh down -key=...*F19:-:display-brightness.sh up diff --git a/packages/keylaunch/files/collie/.mtn2git_empty b/packages/keylaunch/files/collie/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/keylaunch/files/collie/keylaunchrc b/packages/keylaunch/files/collie/keylaunchrc deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/keylaunch/files/corgie/.mtn2git_empty b/packages/keylaunch/files/corgie/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/keylaunch/files/corgie/keylaunchrc b/packages/keylaunch/files/corgie/keylaunchrc deleted file mode 100644 index e0b729a508..0000000000 --- a/packages/keylaunch/files/corgie/keylaunchrc +++ /dev/null @@ -1,6 +0,0 @@ -key=....F9:-:gpe-calendar -key=....F10:-:gpe-contacts -key=....F13:-:sylpheed -key=....F12:-:gpe-mini-browser -key=...*F18:-:display-brightness.sh down -key=...*F19:-:display-brightness.sh up diff --git a/packages/keylaunch/files/husky/.mtn2git_empty b/packages/keylaunch/files/husky/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/keylaunch/files/husky/keylaunchrc b/packages/keylaunch/files/husky/keylaunchrc deleted file mode 100644 index e0b729a508..0000000000 --- a/packages/keylaunch/files/husky/keylaunchrc +++ /dev/null @@ -1,6 +0,0 @@ -key=....F9:-:gpe-calendar -key=....F10:-:gpe-contacts -key=....F13:-:sylpheed -key=....F12:-:gpe-mini-browser -key=...*F18:-:display-brightness.sh down -key=...*F19:-:display-brightness.sh up diff --git a/packages/keylaunch/files/keylaunchrc b/packages/keylaunch/files/keylaunchrc deleted file mode 100644 index 0296db9dad..0000000000 --- a/packages/keylaunch/files/keylaunchrc +++ /dev/null @@ -1,8 +0,0 @@ -key=????Pressed XF86AudioRecord:gpe-soundbite record --autogenerate-filename $HOME_VOLATILE -key=????Pressed XF86Calendar:gpe-calendar -key=????Pressed telephone:gpe-contacts -key=????Pressed XF86Mail:gpe-taskmanager -key=????Pressed XF86Start:~matchbox-remote -desktop -key=????Pressed XF86PowerDown:~apm --suspend -key=????Held XF86PowerDown:~bl toggle -key=????Combine XF86Calendar XF86Start:gpe-keylock diff --git a/packages/keylaunch/files/shepherd/.mtn2git_empty b/packages/keylaunch/files/shepherd/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/keylaunch/files/shepherd/keylaunchrc b/packages/keylaunch/files/shepherd/keylaunchrc deleted file mode 100644 index e0b729a508..0000000000 --- a/packages/keylaunch/files/shepherd/keylaunchrc +++ /dev/null @@ -1,6 +0,0 @@ -key=....F9:-:gpe-calendar -key=....F10:-:gpe-contacts -key=....F13:-:sylpheed -key=....F12:-:gpe-mini-browser -key=...*F18:-:display-brightness.sh down -key=...*F19:-:display-brightness.sh up diff --git a/packages/keylaunch/files/spitz/.mtn2git_empty b/packages/keylaunch/files/spitz/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/keylaunch/files/spitz/keylaunchrc b/packages/keylaunch/files/spitz/keylaunchrc deleted file mode 100644 index 9bb64db066..0000000000 --- a/packages/keylaunch/files/spitz/keylaunchrc +++ /dev/null @@ -1,28 +0,0 @@ -key=....F9:-:gpe-calendar -key=....F10:-:gpe-contacts -key=....F13:-:sylpheed -key=....F12:-:~matchbox-remote -next -key=...*F12:-:~matchbox-remote -desktop -key=....F11:-:~matchbox-remote -menu -#key=...*1:-:~zoom out -#key=...*2:-:~zoom in -key=...*3:-:~display-brightness.sh down -key=...*4:-:~display-brightness.sh up - -# LCD Softkeys -# Please note that the space _between_ two softkeys can be used, too ;) -#key=....F20:-: -key=....F21:-:~matchbox-remote -next -#key=....F22:-: -key=....F23:-:sylpheed -#key=....F24:-: -key=....F25:-:gpe-contacts -#key=....F26:-: -key=....F27:-:gpe-calendar -#key=....F28:-: -#key=....F29:-: -#key=....F30:-: - -# VT changing -key=...*Left:-:~chvt 1 -key=...*Right:-:~chvt 3 diff --git a/packages/keylaunch/keylaunch-conf/.mtn2git_empty b/packages/keylaunch/keylaunch-conf/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/keylaunch/keylaunch-conf/80chvt-SUID b/packages/keylaunch/keylaunch-conf/80chvt-SUID new file mode 100644 index 0000000000..e3b4efef5d --- /dev/null +++ b/packages/keylaunch/keylaunch-conf/80chvt-SUID @@ -0,0 +1,25 @@ +#! /bin/sh +# +# Copyright Matthias Hentges (c) 2006 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: chvt-SUID.sh +# Date: 28-May-06 + + +# +# Sets the SUID bit on chvt to allow changing to the VT from inside X by +# any user. Since a SUID binary still is a security risk, we chmod only +# when keylaunch is used and not by default. +# + +for target in /usr/bin/chvt.console-tools +do + if test "`ls -l "$target" | awk '{print $1}'|cut -c 2-4`" != "rws" + then + echo "Making [$target] SUID root..." + chmod u+s "$target" + else + echo "Ignoring [$target]" + fi +done diff --git a/packages/keylaunch/keylaunch-conf/akita/.mtn2git_empty b/packages/keylaunch/keylaunch-conf/akita/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/keylaunch/keylaunch-conf/akita/keylaunchrc b/packages/keylaunch/keylaunch-conf/akita/keylaunchrc new file mode 100644 index 0000000000..9bb64db066 --- /dev/null +++ b/packages/keylaunch/keylaunch-conf/akita/keylaunchrc @@ -0,0 +1,28 @@ +key=....F9:-:gpe-calendar +key=....F10:-:gpe-contacts +key=....F13:-:sylpheed +key=....F12:-:~matchbox-remote -next +key=...*F12:-:~matchbox-remote -desktop +key=....F11:-:~matchbox-remote -menu +#key=...*1:-:~zoom out +#key=...*2:-:~zoom in +key=...*3:-:~display-brightness.sh down +key=...*4:-:~display-brightness.sh up + +# LCD Softkeys +# Please note that the space _between_ two softkeys can be used, too ;) +#key=....F20:-: +key=....F21:-:~matchbox-remote -next +#key=....F22:-: +key=....F23:-:sylpheed +#key=....F24:-: +key=....F25:-:gpe-contacts +#key=....F26:-: +key=....F27:-:gpe-calendar +#key=....F28:-: +#key=....F29:-: +#key=....F30:-: + +# VT changing +key=...*Left:-:~chvt 1 +key=...*Right:-:~chvt 3 diff --git a/packages/keylaunch/keylaunch-conf/c7x0/.mtn2git_empty b/packages/keylaunch/keylaunch-conf/c7x0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/keylaunch/keylaunch-conf/c7x0/keylaunchrc b/packages/keylaunch/keylaunch-conf/c7x0/keylaunchrc new file mode 100644 index 0000000000..e0b729a508 --- /dev/null +++ b/packages/keylaunch/keylaunch-conf/c7x0/keylaunchrc @@ -0,0 +1,6 @@ +key=....F9:-:gpe-calendar +key=....F10:-:gpe-contacts +key=....F13:-:sylpheed +key=....F12:-:gpe-mini-browser +key=...*F18:-:display-brightness.sh down +key=...*F19:-:display-brightness.sh up diff --git a/packages/keylaunch/keylaunch-conf/collie/.mtn2git_empty b/packages/keylaunch/keylaunch-conf/collie/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/keylaunch/keylaunch-conf/collie/keylaunchrc b/packages/keylaunch/keylaunch-conf/collie/keylaunchrc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/keylaunch/keylaunch-conf/corgie/.mtn2git_empty b/packages/keylaunch/keylaunch-conf/corgie/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/keylaunch/keylaunch-conf/corgie/keylaunchrc b/packages/keylaunch/keylaunch-conf/corgie/keylaunchrc new file mode 100644 index 0000000000..e0b729a508 --- /dev/null +++ b/packages/keylaunch/keylaunch-conf/corgie/keylaunchrc @@ -0,0 +1,6 @@ +key=....F9:-:gpe-calendar +key=....F10:-:gpe-contacts +key=....F13:-:sylpheed +key=....F12:-:gpe-mini-browser +key=...*F18:-:display-brightness.sh down +key=...*F19:-:display-brightness.sh up diff --git a/packages/keylaunch/keylaunch-conf/husky/.mtn2git_empty b/packages/keylaunch/keylaunch-conf/husky/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/keylaunch/keylaunch-conf/husky/keylaunchrc b/packages/keylaunch/keylaunch-conf/husky/keylaunchrc new file mode 100644 index 0000000000..e0b729a508 --- /dev/null +++ b/packages/keylaunch/keylaunch-conf/husky/keylaunchrc @@ -0,0 +1,6 @@ +key=....F9:-:gpe-calendar +key=....F10:-:gpe-contacts +key=....F13:-:sylpheed +key=....F12:-:gpe-mini-browser +key=...*F18:-:display-brightness.sh down +key=...*F19:-:display-brightness.sh up diff --git a/packages/keylaunch/keylaunch-conf/keylaunchrc b/packages/keylaunch/keylaunch-conf/keylaunchrc new file mode 100644 index 0000000000..0296db9dad --- /dev/null +++ b/packages/keylaunch/keylaunch-conf/keylaunchrc @@ -0,0 +1,8 @@ +key=????Pressed XF86AudioRecord:gpe-soundbite record --autogenerate-filename $HOME_VOLATILE +key=????Pressed XF86Calendar:gpe-calendar +key=????Pressed telephone:gpe-contacts +key=????Pressed XF86Mail:gpe-taskmanager +key=????Pressed XF86Start:~matchbox-remote -desktop +key=????Pressed XF86PowerDown:~apm --suspend +key=????Held XF86PowerDown:~bl toggle +key=????Combine XF86Calendar XF86Start:gpe-keylock diff --git a/packages/keylaunch/keylaunch-conf/shepherd/.mtn2git_empty b/packages/keylaunch/keylaunch-conf/shepherd/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/keylaunch/keylaunch-conf/shepherd/keylaunchrc b/packages/keylaunch/keylaunch-conf/shepherd/keylaunchrc new file mode 100644 index 0000000000..e0b729a508 --- /dev/null +++ b/packages/keylaunch/keylaunch-conf/shepherd/keylaunchrc @@ -0,0 +1,6 @@ +key=....F9:-:gpe-calendar +key=....F10:-:gpe-contacts +key=....F13:-:sylpheed +key=....F12:-:gpe-mini-browser +key=...*F18:-:display-brightness.sh down +key=...*F19:-:display-brightness.sh up diff --git a/packages/keylaunch/keylaunch-conf/spitz/.mtn2git_empty b/packages/keylaunch/keylaunch-conf/spitz/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/keylaunch/keylaunch-conf/spitz/keylaunchrc b/packages/keylaunch/keylaunch-conf/spitz/keylaunchrc new file mode 100644 index 0000000000..9bb64db066 --- /dev/null +++ b/packages/keylaunch/keylaunch-conf/spitz/keylaunchrc @@ -0,0 +1,28 @@ +key=....F9:-:gpe-calendar +key=....F10:-:gpe-contacts +key=....F13:-:sylpheed +key=....F12:-:~matchbox-remote -next +key=...*F12:-:~matchbox-remote -desktop +key=....F11:-:~matchbox-remote -menu +#key=...*1:-:~zoom out +#key=...*2:-:~zoom in +key=...*3:-:~display-brightness.sh down +key=...*4:-:~display-brightness.sh up + +# LCD Softkeys +# Please note that the space _between_ two softkeys can be used, too ;) +#key=....F20:-: +key=....F21:-:~matchbox-remote -next +#key=....F22:-: +key=....F23:-:sylpheed +#key=....F24:-: +key=....F25:-:gpe-contacts +#key=....F26:-: +key=....F27:-:gpe-calendar +#key=....F28:-: +#key=....F29:-: +#key=....F30:-: + +# VT changing +key=...*Left:-:~chvt 1 +key=...*Right:-:~chvt 3 diff --git a/packages/keylaunch/keylaunch-conf_2.0.10.bb b/packages/keylaunch/keylaunch-conf_2.0.10.bb new file mode 100644 index 0000000000..f9748d29f7 --- /dev/null +++ b/packages/keylaunch/keylaunch-conf_2.0.10.bb @@ -0,0 +1,27 @@ +RDEPENDS_append_spitz = " display-brightness" +RDEPENDS_append_akita = " display-brightness" +RDEPENDS_append_c7x0 = " display-brightness" + +SECTION = "gpe" +LICENSE = "GPL" +DESCRIPTION = "Device-specific keylaunch configuration" +PACKAGE_ARCH = "${MACHINE_ARCH}" +PR = "r1" + +SRC_URI = " file://keylaunchrc" +SRC_URI += " file://80chvt-SUID" + +do_install () { + install -d ${D}${sysconfdir} + install -d ${D}${sysconfdir}/X11/Xinit.d + install ${WORKDIR}/keylaunchrc ${D}${sysconfdir}/keylaunchrc.matchbox + install ${WORKDIR}/80chvt-SUID ${D}${sysconfdir}/X11/Xinit.d +} + +pkg_postinst_${PN}() { + update-alternatives --install /etc/keylaunchrc keylaunchrc /etc/keylaunchrc.matchbox 10 +} + +pkg_postrm_${PN}() { + update-alternatives --remove keylaunchrc /etc/keylaunchrc.matchbox +} diff --git a/packages/keylaunch/keylaunch_2.0.10.bb b/packages/keylaunch/keylaunch_2.0.10.bb index f7d63968ac..d267dbac30 100644 --- a/packages/keylaunch/keylaunch_2.0.10.bb +++ b/packages/keylaunch/keylaunch_2.0.10.bb @@ -1,10 +1,7 @@ inherit gpe -DEPENDS = "virtual/xserver libxtst libxau libxpm libgpelaunch display-brightness" - -RDEPENDS_append_spitz = " display-brightness" -RDEPENDS_append_akita = " display-brightness" -RDEPENDS_append_c7x0 = " display-brightness" +DEPENDS = "virtual/xserver libxtst libxau libxpm libgpelaunch keylaunch-conf" +RDEPENDS = "keylaunch-conf" SECTION = "gpe" LICENSE = "GPL" @@ -14,31 +11,14 @@ DESCRIPTION = "A small utility for binding commands to a hot key.\ computers. You can connect each key to a program of your choice; if the\ program is already running, keylaunch can bring its window to the front\ rather than just running another copy." -PACKAGE_ARCH = "${MACHINE_ARCH}" -PR = "r12" +PR = "r13.5" -SRC_URI += " file://keylaunchrc" SRC_URI += " file://makefile-fix.patch;patch=1" -SRC_URI += " file://80chvt-SUID" - -do_install_prepend () { - install ${WORKDIR}/keylaunchrc ${S}/keylaunchrc - - install -d ${D}/etc/X11/Xinit.d - install ${WORKDIR}/80chvt-SUID ${D}/etc/X11/Xinit.d -} - -do_install_append() { - # yeah I know...this is less than ideal - mv ${D}/etc/keylaunchrc ${D}/etc/keylaunchrc.matchbox -} export CVSBUILD="no" -pkg_postinst_${PN}() { - update-alternatives --install /etc/keylaunchrc keylaunchrc /etc/keylaunchrc.matchbox 10 -} - -pkg_postrm_${PN}() { - update-alternatives --remove keylaunchrc /etc/keylaunchrc.matchbox +do_install_append() { + # Remove random crap + rm ${D}/etc/keylaunchrc + rm -rf ${D}/etc/X11/Xinit.d/ } -- cgit v1.2.3 From 8f1caa486910da48461b83396db5fdeedf23614f Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 25 Nov 2007 22:57:59 +0000 Subject: keylaunch-conf: Describe keylaunchrc format. --- packages/keylaunch/keylaunch-conf/keylaunchrc | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'packages') diff --git a/packages/keylaunch/keylaunch-conf/keylaunchrc b/packages/keylaunch/keylaunch-conf/keylaunchrc index 0296db9dad..34b46cf55f 100644 --- a/packages/keylaunch/keylaunch-conf/keylaunchrc +++ b/packages/keylaunch/keylaunch-conf/keylaunchrc @@ -1,3 +1,26 @@ +# Format: +# "key=" [] + ":" [ ":" ] +# ModState: +# "????" - any modifier (don't care) +# "...." - no modifer +# "*..." - Shift +# ".*.." - Control +# "..*." - Alt +# "...*" - AltGr +# Shift/Control/Alt/AltGr can be combined (e.g. ".**." == Control+Alt) +# Event: +# - Normal keytouch (short keypress followed by release) +# Held - Long keytouch (pressed and held for some time) +# Special Events (use with care): +# Pressed - Key was just pressed (note: other events may match too, e.g. +# normal/Held) +# Released - Key was just released (note: other events may match too) +# Combine - Several keys pressed together (note: other events may match too) +# Keysym: One or more (for Combine only) X keysyms +# Window: Ignored, do not use +# Command: Command line to execute, if starts with ~, suppress X startup notification +# (use for non-X apps). +# key=????Pressed XF86AudioRecord:gpe-soundbite record --autogenerate-filename $HOME_VOLATILE key=????Pressed XF86Calendar:gpe-calendar key=????Pressed telephone:gpe-contacts -- cgit v1.2.3 From 923065ba17a1da3760bf92ddc85e1749054f558f Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 25 Nov 2007 23:04:30 +0000 Subject: keylaunch-conf: Never-ever use "Pressed" events in public configs. * It is possible to unambigously distingish events only of two types: (short press) and "Held" (long press). Using any other event type is ambigous. In particular, with the old default config there was ambiguity with power off and backlight toggle bindings - most of the time, backlight toggling also caused power off. As freedom of using any key in any way should be left to user, ambigouos bindings should be avoided. --- packages/keylaunch/keylaunch-conf/keylaunchrc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'packages') diff --git a/packages/keylaunch/keylaunch-conf/keylaunchrc b/packages/keylaunch/keylaunch-conf/keylaunchrc index 34b46cf55f..c84fa25137 100644 --- a/packages/keylaunch/keylaunch-conf/keylaunchrc +++ b/packages/keylaunch/keylaunch-conf/keylaunchrc @@ -21,11 +21,11 @@ # Command: Command line to execute, if starts with ~, suppress X startup notification # (use for non-X apps). # -key=????Pressed XF86AudioRecord:gpe-soundbite record --autogenerate-filename $HOME_VOLATILE -key=????Pressed XF86Calendar:gpe-calendar -key=????Pressed telephone:gpe-contacts -key=????Pressed XF86Mail:gpe-taskmanager -key=????Pressed XF86Start:~matchbox-remote -desktop -key=????Pressed XF86PowerDown:~apm --suspend +key=????XF86AudioRecord:gpe-soundbite record --autogenerate-filename $HOME_VOLATILE +key=????XF86Calendar:gpe-calendar +key=????telephone:gpe-contacts +key=????XF86Mail:gpe-taskmanager +key=????XF86Start:~matchbox-remote -desktop +key=????XF86PowerDown:~apm --suspend key=????Held XF86PowerDown:~bl toggle key=????Combine XF86Calendar XF86Start:gpe-keylock -- cgit v1.2.3 From 8e5cdb82641bb73c85e8424761274246f50d9083 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Mon, 26 Nov 2007 13:24:46 +0000 Subject: keylaunch-conf: Fix permissions on keylaunchrc. --- packages/keylaunch/keylaunch-conf_2.0.10.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/keylaunch/keylaunch-conf_2.0.10.bb b/packages/keylaunch/keylaunch-conf_2.0.10.bb index f9748d29f7..aeb9c862ca 100644 --- a/packages/keylaunch/keylaunch-conf_2.0.10.bb +++ b/packages/keylaunch/keylaunch-conf_2.0.10.bb @@ -6,7 +6,7 @@ SECTION = "gpe" LICENSE = "GPL" DESCRIPTION = "Device-specific keylaunch configuration" PACKAGE_ARCH = "${MACHINE_ARCH}" -PR = "r1" +PR = "r2" SRC_URI = " file://keylaunchrc" SRC_URI += " file://80chvt-SUID" @@ -14,7 +14,7 @@ SRC_URI += " file://80chvt-SUID" do_install () { install -d ${D}${sysconfdir} install -d ${D}${sysconfdir}/X11/Xinit.d - install ${WORKDIR}/keylaunchrc ${D}${sysconfdir}/keylaunchrc.matchbox + install -m 0644 ${WORKDIR}/keylaunchrc ${D}${sysconfdir}/keylaunchrc.matchbox install ${WORKDIR}/80chvt-SUID ${D}${sysconfdir}/X11/Xinit.d } -- cgit v1.2.3 From e22f14aa11c4ba893da020accd9f4103118c30aa Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Mon, 26 Nov 2007 13:25:29 +0000 Subject: keylaunch 2.0.10: Apply patch to unbreak key event capture. * We of course still want to receive key events even after subscribing to property events. This fixes when keylaunch doesn't receive forwarded power buttons events from gpe-login --autolock in its locked state. In plain words: now power button works with autolock screen. --- packages/keylaunch/files/unbreak-keyevents.patch | 22 ++++++++++++++++++++++ packages/keylaunch/keylaunch_2.0.10.bb | 4 ++-- 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 packages/keylaunch/files/unbreak-keyevents.patch (limited to 'packages') diff --git a/packages/keylaunch/files/unbreak-keyevents.patch b/packages/keylaunch/files/unbreak-keyevents.patch new file mode 100644 index 0000000000..0a2d58b16a --- /dev/null +++ b/packages/keylaunch/files/unbreak-keyevents.patch @@ -0,0 +1,22 @@ +# HG changeset patch +# User "Paul Sokolovsky " +# Date 1196027570 -7200 +# Node ID 282176e5c55dba673756b4707716f06a5c8b37e2 +# Parent 833c989472a7987681ea3b8cbd6f9eb77293177a +We of course still want to receive key events even after subscribing to +property events. This fixes when keylaunch doesn't receive forwarded +power buttons events from gpe-login --autolock in its locked state. +In plain words: now power button works with autolock screen. + +diff -r 833c989472a7 -r 282176e5c55d keylaunch.c +--- a/keylaunch.c Sun Nov 25 22:04:29 2007 +0200 ++++ b/keylaunch.c Sun Nov 25 23:52:50 2007 +0200 +@@ -682,7 +682,7 @@ main (int argc, char *argv[]) + { + initialize (argc, argv); + +- XSelectInput (dpy, DefaultRootWindow (dpy), PropertyChangeMask); ++ XSelectInput (dpy, DefaultRootWindow (dpy), PropertyChangeMask | KeyPressMask | KeyReleaseMask); + gpe_launch_monitor_display (dpy); + + signal (SIGCHLD, SIG_IGN); diff --git a/packages/keylaunch/keylaunch_2.0.10.bb b/packages/keylaunch/keylaunch_2.0.10.bb index d267dbac30..2afba67f16 100644 --- a/packages/keylaunch/keylaunch_2.0.10.bb +++ b/packages/keylaunch/keylaunch_2.0.10.bb @@ -11,9 +11,9 @@ DESCRIPTION = "A small utility for binding commands to a hot key.\ computers. You can connect each key to a program of your choice; if the\ program is already running, keylaunch can bring its window to the front\ rather than just running another copy." -PR = "r13.5" +PR = "r14" -SRC_URI += " file://makefile-fix.patch;patch=1" +SRC_URI += " file://makefile-fix.patch;patch=1 file://unbreak-keyevents.patch;patch=1" export CVSBUILD="no" -- cgit v1.2.3 From 0bd5a64203d0d45c4afb7f8723a553a3a830921f Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Mon, 26 Nov 2007 13:28:46 +0000 Subject: gpe-login 0.90: Die, die, die gpe-xcalibrate.sh! * Unbreaks "Record" button press for recalibration during initial login screen (autolock screen has been fixed by previously applied and mainstreamed patch). --- packages/gpe-login/files/gpe-xcalibrate-rises-from-dead.patch | 8 ++++++++ packages/gpe-login/gpe-login_0.90.bb | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 packages/gpe-login/files/gpe-xcalibrate-rises-from-dead.patch (limited to 'packages') diff --git a/packages/gpe-login/files/gpe-xcalibrate-rises-from-dead.patch b/packages/gpe-login/files/gpe-xcalibrate-rises-from-dead.patch new file mode 100644 index 0000000000..afad073acf --- /dev/null +++ b/packages/gpe-login/files/gpe-xcalibrate-rises-from-dead.patch @@ -0,0 +1,8 @@ +diff -r 976c01632fea gpe-login.keylaunchrc +--- a/gpe-login.keylaunchrc Sun Nov 25 22:39:23 2007 +0200 ++++ b/gpe-login.keylaunchrc Mon Nov 26 01:12:14 2007 +0200 +@@ -1,3 +1,3 @@ key=????XF86AudioRecord:xcalibrate:/usr/ +-key=????XF86AudioRecord:xcalibrate:/usr/bin/gpe-xcalibrate.sh ++key=????XF86AudioRecord:xcalibrate:/usr/bin/xtscal + key=????XF86PowerDown:-:/usr/bin/apm --suspend + key=????Held XF86PowerDown:-:bl toggle diff --git a/packages/gpe-login/gpe-login_0.90.bb b/packages/gpe-login/gpe-login_0.90.bb index 08cfa2a0e0..6b8afb2b6b 100644 --- a/packages/gpe-login/gpe-login_0.90.bb +++ b/packages/gpe-login/gpe-login_0.90.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" RDEPENDS = "xkbd gpe-theme-clearlooks" RPROVIDES_${PN} = "gpe-session-starter" -PR = "r2" +PR = "r3" SRC_URI_OVERRIDES_PACKAGE_ARCH = "1" @@ -16,6 +16,7 @@ inherit gpe autotools pkgconfig SRC_URI += "file://removeblue-fontsize8.patch;patch=1" SRC_URI += " file://chvt-keylaunch.patch;patch=1 " +SRC_URI += " file://gpe-xcalibrate-rises-from-dead.patch;patch=1 " SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1" SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1" -- cgit v1.2.3 From 23a4ba0f9f76dad66e8aac67bf5908d881f52c72 Mon Sep 17 00:00:00 2001 From: Sergey Lapin Date: Mon, 26 Nov 2007 13:39:01 +0000 Subject: Linux for palms: repository change --- packages/linux/linux-hackndev-2.6_git.bb | 85 ++++++++++++++++++++++++++++++++ packages/linux/linux-hackndev-2.6_svn.bb | 84 ------------------------------- 2 files changed, 85 insertions(+), 84 deletions(-) create mode 100644 packages/linux/linux-hackndev-2.6_git.bb delete mode 100644 packages/linux/linux-hackndev-2.6_svn.bb (limited to 'packages') diff --git a/packages/linux/linux-hackndev-2.6_git.bb b/packages/linux/linux-hackndev-2.6_git.bb new file mode 100644 index 0000000000..750be1a648 --- /dev/null +++ b/packages/linux/linux-hackndev-2.6_git.bb @@ -0,0 +1,85 @@ +DESCRIPTION = "Hack&Dev's Linux kernel for Palm devices." +HOMEPAGE = "http://www.hackndev.com/" +SECTION = "kernel" +LICENSE = "GPL" +PR = "r12" + +COMPATIBLE_MACHINE = "(palmld|palmtc|palmtt3|palmtt5|palmtx|palmz31|palmz72|palmt650)" + +SRC_URI = "git://git.hackndev.com/git/linux-hnd;protocol=http \ + file://defconfig" + +SRC_URI_append_palmtx += "http://www.busybox.net/downloads/busybox-1.1.0.tar.bz2 \ + file://init \ + file://initramfs_list \ + file://busybox-config" + +S = "${WORKDIR}/trunk" + +K_MAJOR = "2" +K_MINOR = "6" +K_MICRO = "21" +HHV="hnd3" +PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-${HHV}" + +inherit kernel + +do_configure() { + + if [ -f ${WORKDIR}/defconfig ]; then + install -m 0644 ${WORKDIR}/defconfig ${S}/.config || die "No configuration for ${MACHINE} available." + else + install -m 0644 ${S}/arch/arm/configs/${MACHINE}_defconfig ${S}/.config \ + || die "No default configuration for ${MACHINE} available." + fi + + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then + echo "CONFIG_AEABI=y" >> ${S}/.config + echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config + else + echo "# CONFIG_AEABI is not set" >> ${S}/.config + echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config + fi + + if [ -f ${WORKDIR}/initramfs_list ]; then + install -m 0644 ${WORKDIR}/busybox-config ${WORKDIR}/busybox-1.1.0/.config \ + || die "No busybox configuration available." + + echo "CROSS_COMPILER_PREFIX=\"${TARGET_PREFIX}\"" >> ${WORKDIR}/busybox-1.1.0/.config + echo "USING_CROSS_COMPILER=y" >> ${WORKDIR}/busybox-1.1.0/.config + + MY_UID=`id -u` + MY_GID=`id -g` + + echo "CONFIG_INITRAMFS_SOURCE=\"../initramfs_list\"" >> ${S}/.config + echo "CONFIG_INITRAMFS_ROOT_UID=${MY_UID}" >> ${S}/.config + echo "CONFIG_INITRAMFS_ROOT_GID=${MY_GID}" >> ${S}/.config + else + echo "CONFIG_INITRAMFS_SOURCE=\"\"" >> ${S}/.config + echo "CONFIG_INITRAMFS_ROOT_UID=0" >> ${S}/.config + echo "CONFIG_INITRAMFS_ROOT_GID=0" >> ${S}/.config + + fi + + yes '' | oe_runmake oldconfig + +} + + +do_compile_prepend() { + if [ -f ${WORKDIR}/initramfs_list ]; then + cd ${WORKDIR}/busybox-1.1.0 + oe_runmake 'CC=${CC}' 'CROSS=${HOST_PREFIX}' + cd - + fi +} + +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} +} + +do_deploy[dirs] = "${S}" + +addtask deploy before do_build after do_compile + diff --git a/packages/linux/linux-hackndev-2.6_svn.bb b/packages/linux/linux-hackndev-2.6_svn.bb deleted file mode 100644 index b76fbbb317..0000000000 --- a/packages/linux/linux-hackndev-2.6_svn.bb +++ /dev/null @@ -1,84 +0,0 @@ -DESCRIPTION = "Hack&Dev's Linux kernel for Palm devices." -HOMEPAGE = "http://www.hackndev.com/" -SECTION = "kernel" -LICENSE = "GPL" -PR = "r11" - -COMPATIBLE_MACHINE = "(palmld|palmtc|palmtt3|palmtt5|palmtx|palmz31|palmz72|palmt650)" - -SRC_URI = "svn://hackndev.svn.sourceforge.net/svnroot/hackndev/linux4palm/linux;module=trunk;proto=https \ - file://defconfig" - -SRC_URI_append_palmtx += "http://www.busybox.net/downloads/busybox-1.1.0.tar.bz2 \ - file://init \ - file://initramfs_list \ - file://busybox-config" - -S = "${WORKDIR}/trunk" - -K_MAJOR = "2" -K_MINOR = "6" -K_MICRO = "21" -HHV="hnd2" -PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-${HHV}" - -inherit kernel - -do_configure() { - - if [ -f ${WORKDIR}/defconfig ]; then - install -m 0644 ${WORKDIR}/defconfig ${S}/.config || die "No configuration for ${MACHINE} available." - else - install -m 0644 ${S}/arch/arm/configs/${MACHINE}_defconfig ${S}/.config \ - || die "No default configuration for ${MACHINE} available." - fi - - if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then - echo "CONFIG_AEABI=y" >> ${S}/.config - echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config - else - echo "# CONFIG_AEABI is not set" >> ${S}/.config - echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config - fi - - if [ -f ${WORKDIR}/initramfs_list ]; then - install -m 0644 ${WORKDIR}/busybox-config ${WORKDIR}/busybox-1.1.0/.config \ - || die "No busybox configuration available." - - echo "CROSS_COMPILER_PREFIX=\"${TARGET_PREFIX}\"" >> ${WORKDIR}/busybox-1.1.0/.config - echo "USING_CROSS_COMPILER=y" >> ${WORKDIR}/busybox-1.1.0/.config - - MY_UID=`id -u` - MY_GID=`id -g` - - echo "CONFIG_INITRAMFS_SOURCE=\"../initramfs_list\"" >> ${S}/.config - echo "CONFIG_INITRAMFS_ROOT_UID=${MY_UID}" >> ${S}/.config - echo "CONFIG_INITRAMFS_ROOT_GID=${MY_GID}" >> ${S}/.config - else - echo "CONFIG_INITRAMFS_SOURCE=\"\"" >> ${S}/.config - echo "CONFIG_INITRAMFS_ROOT_UID=0" >> ${S}/.config - echo "CONFIG_INITRAMFS_ROOT_GID=0" >> ${S}/.config - - fi - - yes '' | oe_runmake oldconfig - -} - - -do_compile_prepend() { - if [ -f ${WORKDIR}/initramfs_list ]; then - cd ${WORKDIR}/busybox-1.1.0 - oe_runmake 'CC=${CC}' 'CROSS=${HOST_PREFIX}' - cd - - fi -} - -do_deploy() { - install -d ${DEPLOY_DIR_IMAGE} - install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} -} - -do_deploy[dirs] = "${S}" - -addtask deploy before do_build after do_compile -- cgit v1.2.3 From 7639f2359fb6e8d4c861146b1ed4b1f3833cd75b Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Mon, 26 Nov 2007 16:09:20 +0000 Subject: gpe-login 0.90: Lock screen on suspend, not on resume. * When using gpe-login --autolock, lock screen before going to suspend, not after coming out of resume, as otherwise there's noticeable delay with screen unprotected. * Closes #3370. * Upstream bug http://bugs.linuxtogo.org/show_bug.cgi?id=125 --- packages/gpe-login/files/lock-on-supend.patch | 14 ++++++++++++++ packages/gpe-login/gpe-login_0.90.bb | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 packages/gpe-login/files/lock-on-supend.patch (limited to 'packages') diff --git a/packages/gpe-login/files/lock-on-supend.patch b/packages/gpe-login/files/lock-on-supend.patch new file mode 100644 index 0000000000..2aeb20f1ea --- /dev/null +++ b/packages/gpe-login/files/lock-on-supend.patch @@ -0,0 +1,14 @@ +Lock screen when device goes to suspend, not after some time has passed +since resume and they stole your data from the unprotected screen. + +--- gpe-login-0.90/Makefile.am.org 2007-04-02 15:46:52.000000000 +0300 ++++ gpe-login-0.90/Makefile.am 2007-11-24 22:41:24.000000000 +0200 +@@ -17,7 +17,7 @@ + x11_SCRIPTS = gpe-login.setup X11/gpe-login.pre-session + x11_DATA = gpe-login.keylaunchrc X11/gpe-login.gtkrc + +-apmdir = $(sysconfdir)/apm/resume.d ++apmdir = $(sysconfdir)/apm/suspend.d + apm_SCRIPTS = gpe-login.suspend + + xsessiondir = $(sysconfdir)/X11/Xsession.d diff --git a/packages/gpe-login/gpe-login_0.90.bb b/packages/gpe-login/gpe-login_0.90.bb index 6b8afb2b6b..c2a274ba8b 100644 --- a/packages/gpe-login/gpe-login_0.90.bb +++ b/packages/gpe-login/gpe-login_0.90.bb @@ -5,7 +5,7 @@ LICENSE =