diff options
| -rw-r--r-- | classes/image.bbclass | 11 | ||||
| -rw-r--r-- | conf/documentation.conf | 3 | ||||
| -rw-r--r-- | conf/machine/h2200.conf | 3 | ||||
| -rw-r--r-- | packages/tasks/task-boot.bb | 2 | ||||
| -rw-r--r-- | packages/xserver-common/files/unbreak-simpad.patch | 18 | ||||
| -rw-r--r-- | packages/xserver-common/xserver-common_1.18.bb | 4 |
6 files changed, 37 insertions, 4 deletions
diff --git a/classes/image.bbclass b/classes/image.bbclass index 312307c831..ca9c9458e1 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -125,6 +125,17 @@ insert_feed_uris () { # insert new feed-sources echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg/${feed_name}-feed.conf done + + # Allow to use package deploy directory contents as quick devel-testing + # feed. This creates individual feed configs for each arch subdir of those + # specified as compatible for the current machine. + # NOTE: Development-helper feature, NOT a full-fledged feed. + if [ -n "${FEED_DEPLOYDIR_BASE_URI}" ]; then + for arch in ${PACKAGE_ARCHS} + do + echo "src/gz local-$arch ${FEED_DEPLOYDIR_BASE_URI}/$arch" >> ${IMAGE_ROOTFS}/etc/ipkg/local-$arch-feed.conf + done + fi } log_check() { diff --git a/conf/documentation.conf b/conf/documentation.conf index 96a292b9d7..6c71bc00c7 100644 --- a/conf/documentation.conf +++ b/conf/documentation.conf @@ -103,6 +103,9 @@ PCMCIA_MANAGER[doc] = "Specify which package(s) to install to handle PCMCIA slot SYSVINIT_ENABLED_GETTYS[doc] = "Specify which VTs should be running a getty, the default is 1" +FEED_URIS[doc] = "List of ipkg feed records to put into generated image." +FEED_DEPLOYDIR_BASE_URI[doc] = "Allow to serve ipk deploy dir as an adhoc feed (bogofeed). Set to base URL of the dir as exported by HTTP. Set of adhoc feed configs will be generated in image." + # insane bbclass QA_LOG[doc] = "Enable logging of QA errors to log.qa_package. Default is not to log." diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index 75ffc0d423..b54859b913 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -26,7 +26,8 @@ PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" -MACHINE_EXTRA_RDEPENDS = "h2200-bootloader udev-hostap-cs-vcc-workaround" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS = " h2200-bootloader " +MACHINE_EXTRA_RDEPENDS = " udev-hostap-cs-vcc-workaround " MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-snd-h2200-audio \ kernel-module-i2c-pxa \ diff --git a/packages/tasks/task-boot.bb b/packages/tasks/task-boot.bb index 0435c2aa62..5663ff5a3d 100644 --- a/packages/tasks/task-boot.bb +++ b/packages/tasks/task-boot.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Basic task to get a device booting" -PR = "r42" +PR = "r43" inherit task diff --git a/packages/xserver-common/files/unbreak-simpad.patch b/packages/xserver-common/files/unbreak-simpad.patch new file mode 100644 index 0000000000..7f557c317d --- /dev/null +++ b/packages/xserver-common/files/unbreak-simpad.patch @@ -0,0 +1,18 @@ +--- xserver-common-1.18/X11/Xinit.d/12keymap.org 2007-08-24 14:14:31.000000000 +0300 ++++ xserver-common-1.18/X11/Xinit.d/12keymap 2007-12-22 15:06:52.000000000 +0200 +@@ -15,14 +15,11 @@ + "Sharp-Collie") + xmodmap - < /etc/X11/collie.xmodmap + ;; +- "Simpad") +- xmodmap - < /etc/X11/simpad.xmodmap +- ;; + "HP iPAQ h6300") + xmodmap - < /etc/X11/h6300.xmodmap + ;; + # All the rest of keyboardless PDA machines use common buttonmap +- "HP iPAQ"* | "Asus MyPal"*) ++ "Simpad" | "HP iPAQ"* | "Asus MyPal"*) + xmodmap - < /etc/X11/keyboardless.xmodmap + ;; + esac diff --git a/packages/xserver-common/xserver-common_1.18.bb b/packages/xserver-common/xserver-common_1.18.bb index a30a37c893..bf7b049939 100644 --- a/packages/xserver-common/xserver-common_1.18.bb +++ b/packages/xserver-common/xserver-common_1.18.bb @@ -2,14 +2,14 @@ DESCRIPTION = "Common X11 scripts and support files" LICENSE = "GPL" SECTION = "x11" RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo" -PR = "r0" +PR = "r1" PACKAGE_ARCH = "all" # we are using a gpe-style Makefile inherit gpe -SRC_URI_append = " file://setDPI.sh " +SRC_URI_append = " file://unbreak-simpad.patch;patch=1 file://setDPI.sh " do_install_append() { install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" |