diff --git a/packages/linux-drivers/linux-tbs-drivers/build b/packages/linux-drivers/linux-tbs-drivers/build index af3aabce0e..779aa1a1a7 100755 --- a/packages/linux-drivers/linux-tbs-drivers/build +++ b/packages/linux-drivers/linux-tbs-drivers/build @@ -27,4 +27,6 @@ cd $BUILD/${PKG_NAME}-${PKG_VERSION}/linux-tbs-drivers [ "$TARGET_ARCH" = "i386" ] && ./v4l/tbs-x86_r3.sh [ "$TARGET_ARCH" = "x86_64" ] && ./v4l/tbs-x86_64.sh +LDFLAGS="" make DIR=$(kernel_path) prepare +sed -i -e "s|^CONFIG_IR_LIRC_CODEC=.*$|# CONFIG_IR_LIRC_CODEC is not set|" v4l/.config LDFLAGS="" make DIR=$(kernel_path) diff --git a/packages/sysutils/e2fsprogs/meta b/packages/sysutils/e2fsprogs/meta index b06f50b064..9cf95274f8 100644 --- a/packages/sysutils/e2fsprogs/meta +++ b/packages/sysutils/e2fsprogs/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="e2fsprogs" -PKG_VERSION="1.42.6" +PKG_VERSION="1.42.7" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/sysutils/ntfs-3g_ntfsprogs/meta b/packages/sysutils/ntfs-3g_ntfsprogs/meta index a4d3e5deda..cff28748f6 100644 --- a/packages/sysutils/ntfs-3g_ntfsprogs/meta +++ b/packages/sysutils/ntfs-3g_ntfsprogs/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="ntfs-3g_ntfsprogs" -PKG_VERSION="2012.1.15" +PKG_VERSION="2013.1.13" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/sysutils/remote/eventlircd/patches/eventlircd-42-002-custom_config.patch b/packages/sysutils/remote/eventlircd/patches/eventlircd-42-002-custom_config.patch index ad1b4fa78d..9412adce48 100644 --- a/packages/sysutils/remote/eventlircd/patches/eventlircd-42-002-custom_config.patch +++ b/packages/sysutils/remote/eventlircd/patches/eventlircd-42-002-custom_config.patch @@ -1,14 +1,12 @@ diff --git a/udev/lircd_helper.in b/udev/lircd_helper.in -index f580cc6..6befeed 100644 +index f580cc6..d4d7f3f 100644 --- a/udev/lircd_helper.in +++ b/udev/lircd_helper.in @@ -41,7 +41,11 @@ case "${ACTION}" in daemon="${daemon} --uinput" -- daemon="${daemon} --output=@localstatedir@/run/lirc/lircd-${devname_instance}" -- daemon="${daemon} --pidfile=@localstatedir@/run/lirc/lircd-${devname_instance}.pid" + daemon="${daemon} --output=@localstatedir@/run/lirc/lircd-${devname_instance}" + daemon="${daemon} --pidfile=@localstatedir@/run/lirc/lircd-${devname_instance}.pid" - daemon="${daemon} ${lircd_conf}" -+ daemon="${daemon} --output=@localstatedir@/run/lirc/lircd" -+ daemon="${daemon} --pidfile=@localstatedir@/run/lirc/lircd-${devname_instance}.pid" + if test -e "/storage/.config/lircd.conf" ; then + daemon="${daemon} /storage/.config/lircd.conf" + else diff --git a/packages/sysutils/remote/eventlircd/udev.d/98-lircd.rules b/packages/sysutils/remote/eventlircd/udev.d/98-lircd.rules index 99dbd09c30..4ab905ddcf 100644 --- a/packages/sysutils/remote/eventlircd/udev.d/98-lircd.rules +++ b/packages/sysutils/remote/eventlircd/udev.d/98-lircd.rules @@ -20,6 +20,11 @@ SUBSYSTEM=="lirc", \ ENV{lircd_driver}="default", \ ENV{lircd_conf}="/etc/lirc/lircd.conf" +### Microsoft Xbox DVD dongle +SUBSYSTEM=="lirc", DRIVERS=="lirc_xbox", \ + ENV{lircd_driver}="default", \ + ENV{lircd_conf}="/etc/lirc/lircd.conf.xbox" + #------------------------------------------------------------------------------- # Ask lircd_helper to handle USB devices that do not show up as lirc devices # and are supported by lircd. Remote controls that are USB HID devices that show @@ -36,21 +41,6 @@ ENV{ID_VENDOR_ID}=="0fe9", ENV{ID_MODEL_ID}=="9010", \ ENV{lircd_driver}="dvico", \ ENV{lircd_conf}="/etc/lirc/lircd.conf" -### Microsoft Xbox DVD dongle -ENV{ID_VENDOR_ID}=="045e", ENV{ID_MODEL_ID}=="0284", \ - ENV{lircd_driver}="default", \ - ENV{lircd_conf}="/etc/lirc/lircd.conf.xbox" - -### Gamester Xbox DVD dongle -ENV{ID_VENDOR_ID}=="040b", ENV{ID_MODEL_ID}=="6521", \ - ENV{lircd_driver}="default", \ - ENV{lircd_conf}="/etc/lirc/lircd.conf.xbox" - -### Chinese Manufacturers Xbox DVD dongle -ENV{ID_VENDOR_ID}=="ffff", ENV{ID_MODEL_ID}=="ffff", \ - ENV{lircd_driver}="default", \ - ENV{lircd_conf}="/etc/lirc/lircd.conf.xbox" - # Enable wake-on-usb for the USB remotes. ENV{lircd_driver}=="?*", ENV{lircd_conf}=="?*", RUN+="wakeup_enable" diff --git a/packages/sysutils/remote/lirc/config/lircd.conf.xbox b/packages/sysutils/remote/lirc/config/lircd.conf.xbox index d7cd33e9ee..764eec06d8 100644 --- a/packages/sysutils/remote/lirc/config/lircd.conf.xbox +++ b/packages/sysutils/remote/lirc/config/lircd.conf.xbox @@ -1,43 +1,63 @@ + +# Please make this file available to others +# by sending it to +# +# this config file was automatically generated +# using lirc-0.9.1-git(default) on Sat Jan 26 21:54:39 2013 +# +# contributed by +# +# brand: xbox.conf +# model no. of remote control: +# devices being controlled by this remote: +# + begin remote - name XboxDVDDongle - bits 8 - eps 30 - aeps 100 + name xbox.conf + bits 8 + eps 30 + aeps 100 - one 0 0 - zero 0 0 - gap 163983 - toggle_bit_mask 0x0 + one 0 0 + zero 0 0 + gap 63985 + min_repeat 13 +# suppress_repeat 13 +# uncomment to suppress unwanted repeats +# toggle_bit_mask 0x72 + toggle_bit_mask 0xE1 - begin codes - LEFT 0xA9 - UP 0xA6 - RIGHT 0xA8 - DOWN 0xA7 - SELECT 0x0B - 1 0xCE - 2 0xCD - 3 0xCC - 4 0xCB - 5 0xCA - 6 0xC9 - 7 0xC8 - 8 0xC7 - 9 0xC6 - 0 0xCF - MENU 0xF7 - DISPLAY 0xD5 - REVERSE 0xE2 - FORWARD 0xE3 - PLAY 0xEA - PAUSE 0xE6 - STOP 0xE0 - SKIP- 0xDD - SKIP+ 0xDF - TITLE 0xE5 - INFO 0xC3 - BACK 0xD8 - end codes + begin codes + KEY_OK 0xEA + KEY_STOP 0xE0 + KEY_PAUSE 0xE6 + KEY_NEXT 0xDF + KEY_PREVIOUS 0xDD + KEY_FASTFORWARD 0xE3 + KEY_REWIND 0xE2 + KEY_PROG1 0xD5 + KEY_TITLE 0xE5 + KEY_INFO 0xC3 + KEY_OK 0x0B + KEY_UP 0xA6 + KEY_DOWN 0xA7 + KEY_LEFT 0xA9 + KEY_RIGHT 0xA8 + KEY_MENU 0xF7 + KEY_BACK 0xD8 + KEY_0 0xCF + KEY_1 0xCE + KEY_2 0xCD + KEY_3 0xCC + KEY_4 0xCB + KEY_5 0xCA + KEY_6 0xC9 + KEY_7 0xC8 + KEY_8 0xC7 + KEY_9 0xC6 + end codes end remote + + diff --git a/packages/sysutils/systemd/build b/packages/sysutils/systemd/build index eff6154fb6..27cf50fb45 100755 --- a/packages/sysutils/systemd/build +++ b/packages/sysutils/systemd/build @@ -74,7 +74,7 @@ ac_cv_func_malloc_0_nonnull=yes \ --disable-localed \ --disable-coredump \ --enable-gudev \ - --disable-keymap \ + --enable-keymap \ --disable-manpages \ --enable-split-usr \ --with-firmware-path="/storage/.config/firmware:/lib/firmware" \ diff --git a/packages/sysutils/systemd/install b/packages/sysutils/systemd/install index 636c100056..e22f81781f 100755 --- a/packages/sysutils/systemd/install +++ b/packages/sysutils/systemd/install @@ -54,10 +54,20 @@ mkdir -p $INSTALL/lib/systemd done cp $PKG_BUILD/mtd_probe $INSTALL/lib/udev + cp $PKG_BUILD/.libs/keymap $INSTALL/lib/udev + cp $PKG_BUILD/src/udev/keymap/findkeyboards $INSTALL/lib/udev + cp $PKG_BUILD/src/udev/keymap/keyboard-force-release.sh $INSTALL/lib/udev +mkdir -p $INSTALL/lib/udev/keymaps + cp $PKG_BUILD/keymaps/* $INSTALL/lib/udev/keymaps +mkdir -p $INSTALL/lib/udev/keymaps/force-release + cp $PKG_BUILD/keymaps-force-release/* $INSTALL/lib/udev/keymaps/force-release + mkdir -p $INSTALL/lib/udev/rules.d cp $PKG_BUILD/rules/*.rules $INSTALL/lib/udev/rules.d rm -rf $INSTALL/lib/udev/rules.d/80-net-name-slot.rules rm -rf $INSTALL/lib/udev/rules.d/99-systemd.rules + cp $PKG_BUILD/src/udev/keymap/*.rules $INSTALL/lib/udev/rules.d + mkdir -p $INSTALL/lib/udev/hwdb.d cp $PKG_BUILD/hwdb/*.hwdb $INSTALL/lib/udev/hwdb.d diff --git a/packages/sysutils/systemd/udev.d/80-clock.rules b/packages/sysutils/systemd/udev.d/80-clock.rules index 18aa7a2c63..6906498f93 100644 --- a/packages/sysutils/systemd/udev.d/80-clock.rules +++ b/packages/sysutils/systemd/udev.d/80-clock.rules @@ -1,2 +1,2 @@ -ACTION=="add", SUBSYSTEM=="rtc", RUN+="/sbin/hwclock --hctosys --rtc=/dev/%k" -ACTION=="add", MAJOR==10, MINOR==135, RUN+="/sbin/hwclock --hctosys --rtc=/dev/%k" +ACTION=="add", SUBSYSTEM=="rtc", RUN+="/sbin/hwclock --hctosys --utc --rtc=/dev/%k" +ACTION=="add", MAJOR==10, MINOR==135, RUN+="/sbin/hwclock --hctosys --utc --rtc=/dev/%k" diff --git a/packages/x11/app/xkbcomp/build b/packages/x11/app/xkbcomp/build index b2bf921a6f..a6bde88fc4 100755 --- a/packages/x11/app/xkbcomp/build +++ b/packages/x11/app/xkbcomp/build @@ -24,10 +24,10 @@ cd $PKG_BUILD -ac_cv_file___xkbparse_c=yes \ ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ --sysconfdir=/etc \ + --with-xkb-config-root=$XORG_PATH_XKB \ make diff --git a/packages/x11/data/xkeyboard-config/build b/packages/x11/data/xkeyboard-config/build index 17b863f79b..de68801b9d 100755 --- a/packages/x11/data/xkeyboard-config/build +++ b/packages/x11/data/xkeyboard-config/build @@ -34,10 +34,11 @@ XKBCOMP="/usr/bin/xkbcomp" \ --sysconfdir=/etc \ --without-xsltproc \ --enable-compat-rules \ + --enable-runtime-deps \ --enable-nls \ --disable-rpath \ --with-xkb-base=$XORG_PATH_XKB \ - --without-xkb-rules-symlink \ + --with-xkb-rules-symlink=xorg \ --with-gnu-ld \ make diff --git a/packages/x11/lib/libX11/build b/packages/x11/lib/libX11/build index d5d6b22443..2a58cbfe35 100755 --- a/packages/x11/lib/libX11/build +++ b/packages/x11/lib/libX11/build @@ -42,7 +42,6 @@ cd $PKG_BUILD --disable-xcms \ --enable-xlocale \ --enable-xkb \ - --disable-xlocaledir \ --disable-xf86bigfont \ --enable-malloc0returnsnull \ --disable-specs \ diff --git a/packages/x11/lib/libX11/install b/packages/x11/lib/libX11/install index ecf4cacea2..7ee76b37a2 100755 --- a/packages/x11/lib/libX11/install +++ b/packages/x11/lib/libX11/install @@ -25,3 +25,9 @@ mkdir -p $INSTALL/usr/lib cp -P $PKG_BUILD/src/.libs/libX11*.so* $INSTALL/usr/lib rm -rf $INSTALL/usr/lib/libX11*.so*T + +mkdir -p $INSTALL/usr/share/X11 + cp -R $SYSROOT_PREFIX/usr/share/X11/locale $INSTALL/usr/share/X11 + +mkdir -p $INSTALL/usr/lib/X11 + cp -R $SYSROOT_PREFIX/usr/lib/X11/locale $INSTALL/usr/lib/X11