diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/cairo/cairo_0.5.2.bb | 16 | ||||
| -rw-r--r-- | packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map | 2 | ||||
| -rw-r--r-- | packages/initscripts/initscripts_1.0.bb | 29 | ||||
| -rw-r--r-- | packages/libusb/libusb-0.1.10a/ARMfix.patch | 20 | ||||
| -rw-r--r-- | packages/squashfs-tools/squashfs-tools-native_2.0r2.bb | 2 |
5 files changed, 48 insertions, 21 deletions
diff --git a/packages/cairo/cairo_0.5.2.bb b/packages/cairo/cairo_0.5.2.bb new file mode 100644 index 0000000000..260541c39f --- /dev/null +++ b/packages/cairo/cairo_0.5.2.bb @@ -0,0 +1,16 @@ +SECTION = "libs" +PRIORITY = "optional" +MAINTAINER = "Phil Blundell <pb@debian.org>" +# DEPENDS = "x11 libpixman libpng fontconfig libxrender xcb glitz" +DEPENDS = "x11 libpixman libpng fontconfig libxrender" +DESCRIPTION = "Cairo graphics library" +LICENSE = "MPL LGPL" +PR = "r0" + +SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.gz" + +inherit autotools pkgconfig + +do_stage () { + oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} +} diff --git a/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map b/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map index 5b576ecc93..dc7fa37401 100644 --- a/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map +++ b/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map @@ -108,11 +108,13 @@ keycode 88 = F11 keycode 97 = Control keycode 99 = F12 keycode 103 = Up + altgr keycode 103 = PageUp keycode 105 = Left altgr keycode 105 = Decr_Console keycode 106 = Right altgr keycode 106 = Incr_Console keycode 108 = Down + altgr keycode 108 = PageDown string F1 = "\033[[A" string F2 = "\033[[B" string F3 = "\033[[C" diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 3fbbda4cf8..32cfc6c7a6 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -6,7 +6,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r48" +PR = "r50" SRC_URI = "file://halt \ file://ramdisk \ @@ -30,15 +30,13 @@ SRC_URI = "file://halt \ file://umountnfs.sh \ file://sysfs.sh \ file://device_table.txt \ - file://populate-volatile.sh \ - file://volatiles \ - file://corgikeymap-2.6.map \ - file://tosakeymap-2.6.map" + file://populate-volatile.sh \ + file://volatiles \ + file://keymap \ + file://keymap*.map" SRC_URI_append_arm = " file://alignment.sh" SRC_URI_append_openzaurus = " file://checkversion" -SRC_URI_append_c7x0 = " file://keymap" -SRC_URI_append_tosa = " file://keymap" def read_kernel_version(d): import bb @@ -99,21 +97,10 @@ do_install () { ln -sf ../init.d/checkversion ${D}${sysconfdir}/rcS.d/S01version fi - if [ "${MACHINE}" == "c7x0" ]; then - install -m 0755 ${WORKDIR}/corgikeymap-2.6.map ${D}${sysconfdir} - install -m 0755 ${WORKDIR}/keymap ${D}${sysconfdir}/init.d - ln -sf ../init.d/keymap ${D}${sysconfdir}/rcS.d/S00keymap - fi - - if [ "${MACHINE}" == "tosa" ]; then - install -m 0755 ${WORKDIR}/tosakeymap-2.6.map ${D}${sysconfdir} - install -m 0755 ${WORKDIR}/keymap ${D}${sysconfdir}/init.d - ln -sf ../init.d/keymap ${D}${sysconfdir}/rcS.d/S00keymap - fi - install -m 0755 ${WORKDIR}/banner ${D}${sysconfdir}/init.d/banner install -m 0755 ${WORKDIR}/devices ${D}${sysconfdir}/init.d/devices install -m 0755 ${WORKDIR}/umountfs ${D}${sysconfdir}/init.d/umountfs + install -m 0755 ${WORKDIR}/keymap ${D}${sysconfdir}/init.d/keymap # # Create runlevel links # @@ -132,6 +119,7 @@ do_install () { ln -sf ../init.d/umountnfs.sh ${D}${sysconfdir}/rc0.d/S31umountnfs.sh # ln -sf ../init.d/umountfs ${D}${sysconfdir}/rc0.d/S40umountfs ln -sf ../init.d/halt ${D}${sysconfdir}/rc0.d/S90halt + ln -sf ../init.d/keymap ${D}${sysconfdir}/rcS.d/S00keymap ln -sf ../init.d/banner ${D}${sysconfdir}/rcS.d/S02banner ln -sf ../init.d/checkroot.sh ${D}${sysconfdir}/rcS.d/S10checkroot.sh # ln -sf ../init.d/checkfs.sh ${D}${sysconfdir}/rcS.d/S30checkfs.sh @@ -150,5 +138,6 @@ do_install () { ln -sf ../init.d/alignment.sh ${D}${sysconfdir}/rcS.d/S06alignment fi - install -m 0755 ${WORKDIR}/device_table.txt ${D}${sysconfdir}/device_table + install -m 0755 ${WORKDIR}/device_table.txt ${D}${sysconfdir}/device_table + install -m 0644 ${WORKDIR}/keymap*.map ${D}${sysconfdir} } diff --git a/packages/libusb/libusb-0.1.10a/ARMfix.patch b/packages/libusb/libusb-0.1.10a/ARMfix.patch new file mode 100644 index 0000000000..803bd99bab --- /dev/null +++ b/packages/libusb/libusb-0.1.10a/ARMfix.patch @@ -0,0 +1,20 @@ +--- /tmp/usb.c 2005-07-22 01:45:43.606167000 +0200 ++++ libusb-0.1.10a/usb.c 2005-07-22 01:47:22.527128728 +0200 +@@ -156,7 +156,7 @@ + * Some ports fetch the descriptors on scanning (like Linux) so we don't + * need to fetch them again. + */ +- if (!dev->config) { ++/* if (!dev->config) { */ + usb_dev_handle *udev; + + udev = usb_open(dev); +@@ -165,7 +165,7 @@ + + usb_close(udev); + } +- } ++/* }*/ + + changes++; + diff --git a/packages/squashfs-tools/squashfs-tools-native_2.0r2.bb b/packages/squashfs-tools/squashfs-tools-native_2.0r2.bb index d7b285e8ec..5bb5af8598 100644 --- a/packages/squashfs-tools/squashfs-tools-native_2.0r2.bb +++ b/packages/squashfs-tools/squashfs-tools-native_2.0r2.bb @@ -1,4 +1,4 @@ -include ${PN_BASE}_${PV}.bb +include squashfs-tools_${PV}.bb DEPENDS = "lzma-native" PN_BASE = "squashfs-tools" |