diff options
Diffstat (limited to 'packages')
19 files changed, 141 insertions, 305 deletions
diff --git a/packages/linux/linux-openzaurus-2.6.16+git/locomo-kbd-hotkeys.patch b/packages/linux/linux-openzaurus-2.6.16+git/locomo-kbd-hotkeys.patch deleted file mode 100644 index 8b296780d4..0000000000 --- a/packages/linux/linux-openzaurus-2.6.16+git/locomo-kbd-hotkeys.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- linux-2.6.16/drivers/input/keyboard/locomokbd.c 2006-05-11 18:15:17.392063008 +0200 -+++ linux-2.6.16/drivers/input/keyboard/locomokbd.c.ok 2006-05-11 18:14:55.870334808 +0200 -@@ -44,24 +44,29 @@ - - #define LOCOMOKBD_NUMKEYS 128 - --#define KEY_ACTIVITY KEY_F16 --#define KEY_CONTACT KEY_F18 --#define KEY_CENTER KEY_F15 -+ -+#define LOCOMO_KEY_CALENDER KEY_F1 -+#define LOCOMO_KEY_ADDRESS KEY_F2 -+#define LOCOMO_KEY_CANCEL KEY_F4 -+#define LOCOMO_KEY_CENTER KEY_F5 -+#define LOCOMO_KEY_MAIL KEY_F10 -+#define LOCOMO_KEY_OK KEY_F11 -+#define LOCOMO_KEY_MENU KEY_F12 - - static unsigned char locomokbd_keycode[LOCOMOKBD_NUMKEYS] = { -- 0, KEY_ESC, KEY_ACTIVITY, 0, 0, 0, 0, 0, 0, 0, /* 0 - 9 */ -- 0, 0, 0, 0, 0, 0, 0, KEY_MENU, KEY_HOME, KEY_CONTACT, /* 10 - 19 */ -- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 20 - 29 */ -- 0, 0, 0, KEY_CENTER, 0, KEY_MAIL, 0, 0, 0, 0, /* 30 - 39 */ -- 0, 0, 0, 0, 0, 0, 0, 0, 0, KEY_RIGHT, /* 40 - 49 */ -- KEY_UP, KEY_LEFT, 0, 0, KEY_P, 0, KEY_O, KEY_I, KEY_Y, KEY_T, /* 50 - 59 */ -- KEY_E, KEY_W, 0, 0, 0, 0, KEY_DOWN, KEY_ENTER, 0, 0, /* 60 - 69 */ -- KEY_BACKSPACE, 0, KEY_L, KEY_U, KEY_H, KEY_R, KEY_D, KEY_Q, 0, 0, /* 70 - 79 */ -- 0, 0, 0, 0, 0, 0, KEY_ENTER, KEY_RIGHTSHIFT, KEY_K, KEY_J, /* 80 - 89 */ -- KEY_G, KEY_F, KEY_X, KEY_S, 0, 0, 0, 0, 0, 0, /* 90 - 99 */ -- 0, 0, KEY_DOT, 0, KEY_COMMA, KEY_N, KEY_B, KEY_C, KEY_Z, KEY_A, /* 100 - 109 */ -- KEY_LEFTSHIFT, KEY_TAB, KEY_LEFTCTRL, 0, 0, 0, 0, 0, 0, 0, /* 110 - 119 */ -- KEY_M, KEY_SPACE, KEY_V, KEY_APOSTROPHE, KEY_SLASH, 0, 0, 0 /* 120 - 128 */ -+ 0, LOCOMO_KEY_CANCEL, LOCOMO_KEY_CALENDER, KEY_HOME, 0, 0, 0, 0, 0, 0, /* 0 - 9 */ -+ KEY_HOME, 0, 0, 0, 0, 0, 0, LOCOMO_KEY_MENU, KEY_HOME, LOCOMO_KEY_ADDRESS, /* 10 - 19 */ -+ 0, 0, 0, 0, 0, LOCOMO_KEY_MAIL, 0, 0, 0, 0, /* 20 - 29 */ -+ 0, 0, 0, LOCOMO_KEY_CENTER, 0, LOCOMO_KEY_MAIL, 0, 0, 0, 0, /* 30 - 39 */ -+ 0, 0, 0, 0, 0, 0, 0, 0, 0, KEY_RIGHT, /* 40 - 49 */ -+ KEY_UP, KEY_LEFT, 0, 0, KEY_P, 0, KEY_O, KEY_I, KEY_Y, KEY_T, /* 50 - 59 */ -+ KEY_E, KEY_W, 0, 0, 0, 0, KEY_DOWN, LOCOMO_KEY_OK, 0, 0, /* 60 - 69 */ -+ KEY_BACKSPACE, 0, KEY_L, KEY_U, KEY_H, KEY_R, KEY_D, KEY_Q, 0, 0, /* 70 - 79 */ -+ 0, 0, 0, 0, 0, 0, KEY_ENTER, KEY_RIGHTSHIFT, KEY_K, KEY_J, /* 80 - 89 */ -+ KEY_G, KEY_F, KEY_X, KEY_S, 0, 0, 0, 0, 0, 0, /* 90 - 99 */ -+ 0, 0, KEY_DOT, 0, KEY_COMMA, KEY_N, KEY_B, KEY_C, KEY_Z, KEY_A, /* 100 - 109 */ -+ KEY_LEFTSHIFT, KEY_TAB, KEY_LEFTCTRL, 0, 0, 0, 0, 0, 0, 0, /* 110 - 119 */ -+ KEY_M, KEY_SPACE, KEY_V, KEY_APOSTROPHE, KEY_SLASH, 0, 0, 0 /* 120 - 128 */ - }; - - #define KB_ROWS 16 diff --git a/packages/linux/linux-openzaurus-2.6.16+git/locomo-lcd-def-bightness.patch b/packages/linux/linux-openzaurus-2.6.16+git/locomo-lcd-def-bightness.patch deleted file mode 100644 index 6408ef9551..0000000000 --- a/packages/linux/linux-openzaurus-2.6.16+git/locomo-lcd-def-bightness.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- linux-2.6.16/drivers/video/backlight/locomolcd.c.orig 2006-05-14 13:24:01.354435088 +0200 -+++ linux-2.6.16/drivers/video/backlight/locomolcd.c 2006-05-14 13:24:11.920828752 +0200 -@@ -201,7 +201,7 @@ - return PTR_ERR (locomolcd_bl_device); - - /* Set up frontlight so that screen is readable */ -- locomobl_data.brightness = 2; -+ locomobl_data.brightness = 3; - locomolcd_set_intensity(locomolcd_bl_device); - - return 0; diff --git a/packages/linux/linux-openzaurus-2.6.16+git/locomo-sysrq+keyrepeat.patch b/packages/linux/linux-openzaurus-2.6.16+git/locomo-sysrq+keyrepeat.patch deleted file mode 100644 index 7e233277da..0000000000 --- a/packages/linux/linux-openzaurus-2.6.16+git/locomo-sysrq+keyrepeat.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- linux-2.6.16/drivers/input/keyboard/locomokbd.c.orig 2006-05-13 22:53:33.810228656 +0200 -+++ linux-2.6.16/drivers/input/keyboard/locomokbd.c 2006-05-13 22:56:56.544408376 +0200 -@@ -45,17 +45,20 @@ - #define LOCOMOKBD_NUMKEYS 128 - - --#define LOCOMO_KEY_CALENDER KEY_F1 --#define LOCOMO_KEY_ADDRESS KEY_F2 --#define LOCOMO_KEY_CANCEL KEY_F4 --#define LOCOMO_KEY_CENTER KEY_F5 --#define LOCOMO_KEY_MAIL KEY_F10 --#define LOCOMO_KEY_OK KEY_F11 -+#define LOCOMO_KEY_CALENDER KEY_LEFTCTRL -+#define LOCOMO_KEY_ADDRESS KEY_LEFTALT /* Needed for SysRQ */ -+#define LOCOMO_KEY_HOME KEY_SYSRQ /* Needed for SysRQ */ - #define LOCOMO_KEY_MENU KEY_F12 -+#define LOCOMO_KEY_MAIL KEY_F10 -+#define LOCOMO_KEY_OK KEY_F11 /* Don't hardwire to KEY_RETURN */ -+#define LOCOMO_KEY_CANCEL KEY_POWER -+#define LOCOMO_KEY_CENTER KEY_F5 /* Don't hardwire to KEY_RETURN */ -+ -+#define LOCOMO_KEY_FN KEY_F9 - - static unsigned char locomokbd_keycode[LOCOMOKBD_NUMKEYS] = { -- 0, LOCOMO_KEY_CANCEL, LOCOMO_KEY_CALENDER, KEY_HOME, 0, 0, 0, 0, 0, 0, /* 0 - 9 */ -- KEY_HOME, 0, 0, 0, 0, 0, 0, LOCOMO_KEY_MENU, KEY_HOME, LOCOMO_KEY_ADDRESS, /* 10 - 19 */ -+ 0, LOCOMO_KEY_CANCEL, LOCOMO_KEY_CALENDER, LOCOMO_KEY_HOME, 0, 0, 0, 0, 0, 0, /* 0 - 9 */ -+ 0, 0, 0, 0, 0, 0, 0, LOCOMO_KEY_MENU, 0, LOCOMO_KEY_ADDRESS, /* 10 - 19 */ - 0, 0, 0, 0, 0, LOCOMO_KEY_MAIL, 0, 0, 0, 0, /* 20 - 29 */ - 0, 0, 0, LOCOMO_KEY_CENTER, 0, LOCOMO_KEY_MAIL, 0, 0, 0, 0, /* 30 - 39 */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, KEY_RIGHT, /* 40 - 49 */ -@@ -65,7 +68,7 @@ - 0, 0, 0, 0, 0, 0, KEY_ENTER, KEY_RIGHTSHIFT, KEY_K, KEY_J, /* 80 - 89 */ - KEY_G, KEY_F, KEY_X, KEY_S, 0, 0, 0, 0, 0, 0, /* 90 - 99 */ - 0, 0, KEY_DOT, 0, KEY_COMMA, KEY_N, KEY_B, KEY_C, KEY_Z, KEY_A, /* 100 - 109 */ -- KEY_LEFTSHIFT, KEY_TAB, KEY_LEFTCTRL, 0, 0, 0, 0, 0, 0, 0, /* 110 - 119 */ -+ KEY_LEFTSHIFT, KEY_TAB, LOCOMO_KEY_FN, 0, 0, 0, 0, 0, 0, 0, /* 110 - 119 */ - KEY_M, KEY_SPACE, KEY_V, KEY_APOSTROPHE, KEY_SLASH, 0, 0, 0 /* 120 - 128 */ - }; - -@@ -76,7 +79,7 @@ - #define NR_SCANCODES 128 - - #define KB_DELAY 8 --#define SCAN_INTERVAL (HZ/10) -+#define SCAN_INTERVAL (HZ/20) - #define LOCOMOKBD_PRESSED 1 - - struct locomokbd { diff --git a/packages/linux/linux-openzaurus-2.6.17/defconfig-ipaq-pxa270 b/packages/linux/linux-openzaurus-2.6.17/defconfig-ipaq-pxa270 index 2b1299116c..cb7cce7bdd 100644 --- a/packages/linux/linux-openzaurus-2.6.17/defconfig-ipaq-pxa270 +++ b/packages/linux/linux-openzaurus-2.6.17/defconfig-ipaq-pxa270 @@ -669,7 +669,7 @@ CONFIG_UNIX98_PTYS=y # # Hardware Monitoring support # -CONFIG_HWMON is not set +# CONFIG_HWMON is not set # # Misc devices diff --git a/packages/linux/linux-openzaurus-2.6.17/locomo-kbd-hotkeys.patch b/packages/linux/linux-openzaurus-2.6.17/locomo-kbd-hotkeys.patch deleted file mode 100644 index 8b296780d4..0000000000 --- a/packages/linux/linux-openzaurus-2.6.17/locomo-kbd-hotkeys.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- linux-2.6.16/drivers/input/keyboard/locomokbd.c 2006-05-11 18:15:17.392063008 +0200 -+++ linux-2.6.16/drivers/input/keyboard/locomokbd.c.ok 2006-05-11 18:14:55.870334808 +0200 -@@ -44,24 +44,29 @@ - - #define LOCOMOKBD_NUMKEYS 128 - --#define KEY_ACTIVITY KEY_F16 --#define KEY_CONTACT KEY_F18 --#define KEY_CENTER KEY_F15 -+ -+#define LOCOMO_KEY_CALENDER KEY_F1 -+#define LOCOMO_KEY_ADDRESS KEY_F2 -+#define LOCOMO_KEY_CANCEL KEY_F4 -+#define LOCOMO_KEY_CENTER KEY_F5 -+#define LOCOMO_KEY_MAIL KEY_F10 -+#define LOCOMO_KEY_OK KEY_F11 -+#define LOCOMO_KEY_MENU KEY_F12 - - static unsigned char locomokbd_keycode[LOCOMOKBD_NUMKEYS] = { -- 0, KEY_ESC, KEY_ACTIVITY, 0, 0, 0, 0, 0, 0, 0, /* 0 - 9 */ -- 0, 0, 0, 0, 0, 0, 0, KEY_MENU, KEY_HOME, KEY_CONTACT, /* 10 - 19 */ -- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 20 - 29 */ -- 0, 0, 0, KEY_CENTER, 0, KEY_MAIL, 0, 0, 0, 0, /* 30 - 39 */ -- 0, 0, 0, 0, 0, 0, 0, 0, 0, KEY_RIGHT, /* 40 - 49 */ -- KEY_UP, KEY_LEFT, 0, 0, KEY_P, 0, KEY_O, KEY_I, KEY_Y, KEY_T, /* 50 - 59 */ -- KEY_E, KEY_W, 0, 0, 0, 0, KEY_DOWN, KEY_ENTER, 0, 0, /* 60 - 69 */ -- KEY_BACKSPACE, 0, KEY_L, KEY_U, KEY_H, KEY_R, KEY_D, KEY_Q, 0, 0, /* 70 - 79 */ -- 0, 0, 0, 0, 0, 0, KEY_ENTER, KEY_RIGHTSHIFT, KEY_K, KEY_J, /* 80 - 89 */ -- KEY_G, KEY_F, KEY_X, KEY_S, 0, 0, 0, 0, 0, 0, /* 90 - 99 */ -- 0, 0, KEY_DOT, 0, KEY_COMMA, KEY_N, KEY_B, KEY_C, KEY_Z, KEY_A, /* 100 - 109 */ -- KEY_LEFTSHIFT, KEY_TAB, KEY_LEFTCTRL, 0, 0, 0, 0, 0, 0, 0, /* 110 - 119 */ -- KEY_M, KEY_SPACE, KEY_V, KEY_APOSTROPHE, KEY_SLASH, 0, 0, 0 /* 120 - 128 */ -+ 0, LOCOMO_KEY_CANCEL, LOCOMO_KEY_CALENDER, KEY_HOME, 0, 0, 0, 0, 0, 0, /* 0 - 9 */ -+ KEY_HOME, 0, 0, 0, 0, 0, 0, LOCOMO_KEY_MENU, KEY_HOME, LOCOMO_KEY_ADDRESS, /* 10 - 19 */ -+ 0, 0, 0, 0, 0, LOCOMO_KEY_MAIL, 0, 0, 0, 0, /* 20 - 29 */ -+ 0, 0, 0, LOCOMO_KEY_CENTER, 0, LOCOMO_KEY_MAIL, 0, 0, 0, 0, /* 30 - 39 */ -+ 0, 0, 0, 0, 0, 0, 0, 0, 0, KEY_RIGHT, /* 40 - 49 */ -+ KEY_UP, KEY_LEFT, 0, 0, KEY_P, 0, KEY_O, KEY_I, KEY_Y, KEY_T, /* 50 - 59 */ -+ KEY_E, KEY_W, 0, 0, 0, 0, KEY_DOWN, LOCOMO_KEY_OK, 0, 0, /* 60 - 69 */ -+ KEY_BACKSPACE, 0, KEY_L, KEY_U, KEY_H, KEY_R, KEY_D, KEY_Q, 0, 0, /* 70 - 79 */ -+ 0, 0, 0, 0, 0, 0, KEY_ENTER, KEY_RIGHTSHIFT, KEY_K, KEY_J, /* 80 - 89 */ -+ KEY_G, KEY_F, KEY_X, KEY_S, 0, 0, 0, 0, 0, 0, /* 90 - 99 */ -+ 0, 0, KEY_DOT, 0, KEY_COMMA, KEY_N, KEY_B, KEY_C, KEY_Z, KEY_A, /* 100 - 109 */ -+ KEY_LEFTSHIFT, KEY_TAB, KEY_LEFTCTRL, 0, 0, 0, 0, 0, 0, 0, /* 110 - 119 */ -+ KEY_M, KEY_SPACE, KEY_V, KEY_APOSTROPHE, KEY_SLASH, 0, 0, 0 /* 120 - 128 */ - }; - - #define KB_ROWS 16 diff --git a/packages/linux/linux-openzaurus-2.6.17/locomo-lcd-def-bightness.patch b/packages/linux/linux-openzaurus-2.6.17/locomo-lcd-def-bightness.patch deleted file mode 100644 index 6408ef9551..0000000000 --- a/packages/linux/linux-openzaurus-2.6.17/locomo-lcd-def-bightness.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- linux-2.6.16/drivers/video/backlight/locomolcd.c.orig 2006-05-14 13:24:01.354435088 +0200 -+++ linux-2.6.16/drivers/video/backlight/locomolcd.c 2006-05-14 13:24:11.920828752 +0200 -@@ -201,7 +201,7 @@ - return PTR_ERR (locomolcd_bl_device); - - /* Set up frontlight so that screen is readable */ -- locomobl_data.brightness = 2; -+ locomobl_data.brightness = 3; - locomolcd_set_intensity(locomolcd_bl_device); - - return 0; diff --git a/packages/linux/linux-openzaurus-2.6.17/locomo-sysrq+keyrepeat.patch b/packages/linux/linux-openzaurus-2.6.17/locomo-sysrq+keyrepeat.patch deleted file mode 100644 index 7e233277da..0000000000 --- a/packages/linux/linux-openzaurus-2.6.17/locomo-sysrq+keyrepeat.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- linux-2.6.16/drivers/input/keyboard/locomokbd.c.orig 2006-05-13 22:53:33.810228656 +0200 -+++ linux-2.6.16/drivers/input/keyboard/locomokbd.c 2006-05-13 22:56:56.544408376 +0200 -@@ -45,17 +45,20 @@ - #define LOCOMOKBD_NUMKEYS 128 - - --#define LOCOMO_KEY_CALENDER KEY_F1 --#define LOCOMO_KEY_ADDRESS KEY_F2 --#define LOCOMO_KEY_CANCEL KEY_F4 --#define LOCOMO_KEY_CENTER KEY_F5 --#define LOCOMO_KEY_MAIL KEY_F10 --#define LOCOMO_KEY_OK KEY_F11 -+#define LOCOMO_KEY_CALENDER KEY_LEFTCTRL -+#define LOCOMO_KEY_ADDRESS KEY_LEFTALT /* Needed for SysRQ */ -+#define LOCOMO_KEY_HOME KEY_SYSRQ /* Needed for SysRQ */ - #define LOCOMO_KEY_MENU KEY_F12 -+#define LOCOMO_KEY_MAIL KEY_F10 -+#define LOCOMO_KEY_OK KEY_F11 /* Don't hardwire to KEY_RETURN */ -+#define LOCOMO_KEY_CANCEL KEY_POWER -+#define LOCOMO_KEY_CENTER KEY_F5 /* Don't hardwire to KEY_RETURN */ -+ -+#define LOCOMO_KEY_FN KEY_F9 - - static unsigned char locomokbd_keycode[LOCOMOKBD_NUMKEYS] = { -- 0, LOCOMO_KEY_CANCEL, LOCOMO_KEY_CALENDER, KEY_HOME, 0, 0, 0, 0, 0, 0, /* 0 - 9 */ -- KEY_HOME, 0, 0, 0, 0, 0, 0, LOCOMO_KEY_MENU, KEY_HOME, LOCOMO_KEY_ADDRESS, /* 10 - 19 */ -+ 0, LOCOMO_KEY_CANCEL, LOCOMO_KEY_CALENDER, LOCOMO_KEY_HOME, 0, 0, 0, 0, 0, 0, /* 0 - 9 */ -+ 0, 0, 0, 0, 0, 0, 0, LOCOMO_KEY_MENU, 0, LOCOMO_KEY_ADDRESS, /* 10 - 19 */ - 0, 0, 0, 0, 0, LOCOMO_KEY_MAIL, 0, 0, 0, 0, /* 20 - 29 */ - 0, 0, 0, LOCOMO_KEY_CENTER, 0, LOCOMO_KEY_MAIL, 0, 0, 0, 0, /* 30 - 39 */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, KEY_RIGHT, /* 40 - 49 */ -@@ -65,7 +68,7 @@ - 0, 0, 0, 0, 0, 0, KEY_ENTER, KEY_RIGHTSHIFT, KEY_K, KEY_J, /* 80 - 89 */ - KEY_G, KEY_F, KEY_X, KEY_S, 0, 0, 0, 0, 0, 0, /* 90 - 99 */ - 0, 0, KEY_DOT, 0, KEY_COMMA, KEY_N, KEY_B, KEY_C, KEY_Z, KEY_A, /* 100 - 109 */ -- KEY_LEFTSHIFT, KEY_TAB, KEY_LEFTCTRL, 0, 0, 0, 0, 0, 0, 0, /* 110 - 119 */ -+ KEY_LEFTSHIFT, KEY_TAB, LOCOMO_KEY_FN, 0, 0, 0, 0, 0, 0, 0, /* 110 - 119 */ - KEY_M, KEY_SPACE, KEY_V, KEY_APOSTROPHE, KEY_SLASH, 0, 0, 0 /* 120 - 128 */ - }; - -@@ -76,7 +79,7 @@ - #define NR_SCANCODES 128 - - #define KB_DELAY 8 --#define SCAN_INTERVAL (HZ/10) -+#define SCAN_INTERVAL (HZ/20) - #define LOCOMOKBD_PRESSED 1 - - struct locomokbd { diff --git a/packages/linux/linux-openzaurus_2.6.16+git.bb b/packages/linux/linux-openzaurus_2.6.16+git.bb index f0ca74bc26..9977b7e2a7 100644 --- a/packages/linux/linux-openzaurus_2.6.16+git.bb +++ b/packages/linux/linux-openzaurus_2.6.16+git.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r19" +PR = "r20" DEFAULT_PREFERENCE = "-1" @@ -19,40 +19,38 @@ SRC_URI = "git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.gi ${RPSRC}/zlib_inflate-r3.patch;patch=1;status=pending \ ${RPSRC}/logo_rotate_fix-r1.patch;patch=1;status=pending \ ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=pending \ + ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=pending \ + ${RPSRC}/collie_frontlight-r6.patch;patch=1;status=pending \ file://00-hostap.patch;patch=1;status=pending \ file://10-pcnet.patch;patch=1;status=pending \ + ${RPSRC}/zaurus_reboot-r3.patch;patch=1 \ + ${RPSRC}/poodle_mmcsd_fix-r0.patch;patch=1 \ + ${RPSRC}/poodle_ssp-r1.patch;patch=1 \ + ${RPSRC}/locomo_led_default_trigger-r0.patch;patch=1 \ + ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1 \ ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1 \ ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1 \ # ${RPSRC}/alsa/asoc-v0.10rc8.patch;patch=1 \ ${RPSRC}/alsa/asoc-v0.10rc4.patch;patch=1 \ ${RPSRC}/asoc_fixups-r1.patch;patch=1 \ - ${RPSRC}/hx2750_base-r24.patch;patch=1 \ - ${RPSRC}/hx2750_bl-r5.patch;patch=1 \ + ${RPSRC}/hx2750_base-r25.patch;patch=1 \ + ${RPSRC}/hx2750_bl-r7.patch;patch=1 \ ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \ ${RPSRC}/pxa_keys-r5.patch;patch=1 \ ${RPSRC}/tsc2101-r12.patch;patch=1 \ ${RPSRC}/hx2750_test1-r3.patch;patch=1 \ ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ ${RPSRC}/input_power-r5.patch;patch=1 \ - ${RPSRC}/jffs2_longfilename-r1.patch;patch=1 \ ${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \ - ${RPSRC}/collie_frontlight-r4.patch;patch=1 \ - ${RPSRC}/zaurus_reboot-r1.patch;patch=1 \ ${RPSRC}/sharpsl_pm_fixes1-r0.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 \ ${RPSRC}/usb_add_epalloc-r1.patch;patch=1 \ ${DOSRC}/kexec-arm-r2.patch;patch=1 \ + ${RPSRC}/locomo_kbd_tweak-r0.patch;patch=1 \ + ${RPSRC}/poodle_pm-r1.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ file://hrw-pcmcia-ids-r2.patch;patch=1 \ - file://locomo-kbd-hotkeys.patch;patch=1 \ - file://locomo-sysrq+keyrepeat.patch;patch=1 \ - file://locomo-lcd-def-bightness.patch;patch=1 \ - ${RPSRC}/locomo_led_default_trigger-r0.patch;patch=1 \ - ${RPSRC}/poodle_mmcsd_fix-r0.patch;patch=1 \ - ${RPSRC}/poodle_ssp-r1.patch;patch=1 \ - ${RPSRC}/poodle_pm-r0.patch;patch=1 \ ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \ diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb index b7c9e3d4c3..c35d1d8e75 100644 --- a/packages/linux/linux-openzaurus_2.6.16.bb +++ b/packages/linux/linux-openzaurus_2.6.16.bb @@ -64,6 +64,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ ${RPSRC}/zlib_inflate-r3.patch;patch=1;status=pending \ ${RPSRC}/logo_rotate_fix-r1.patch;patch=1;status=pending \ ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=pending \ + ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=pending \ file://00-hostap.patch;patch=1;status=pending \ file://10-pcnet.patch;patch=1;status=pending \ ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1 \ @@ -78,7 +79,6 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ ${RPSRC}/hx2750_test1-r3.patch;patch=1 \ ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ ${RPSRC}/input_power-r4.patch;patch=1 \ - ${RPSRC}/jffs2_longfilename-r1.patch;patch=1 \ ${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \ ${RPSRC}/collie_frontlight-r1.patch;patch=1 \ ${RPSRC}/zaurus_reboot-r0.patch;patch=1 \ diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-openzaurus_2.6.17.bb index c610c4b112..dae8e49e68 100644 --- a/packages/linux/linux-openzaurus_2.6.17.bb +++ b/packages/linux/linux-openzaurus_2.6.17.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r0" +PR = "r1" DEFAULT_PREFERENCE = "-1" @@ -19,40 +19,38 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ ${RPSRC}/zlib_inflate-r3.patch;patch=1;status=pending \ ${RPSRC}/logo_rotate_fix-r1.patch;patch=1;status=pending \ ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=pending \ + ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=pending \ + ${RPSRC}/collie_frontlight-r6.patch;patch=1;status=pending \ file://00-hostap.patch;patch=1;status=pending \ file://10-pcnet.patch;patch=1;status=pending \ + ${RPSRC}/zaurus_reboot-r3.patch;patch=1 \ + ${RPSRC}/poodle_mmcsd_fix-r0.patch;patch=1 \ + ${RPSRC}/poodle_ssp-r1.patch;patch=1 \ + ${RPSRC}/locomo_led_default_trigger-r0.patch;patch=1 \ + ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1 \ ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1 \ ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1 \ # ${RPSRC}/alsa/asoc-v0.10rc8.patch;patch=1 \ ${RPSRC}/alsa/asoc-v0.10rc4.patch;patch=1 \ ${RPSRC}/asoc_fixups-r1.patch;patch=1 \ - ${RPSRC}/hx2750_base-r24.patch;patch=1 \ - ${RPSRC}/hx2750_bl-r5.patch;patch=1 \ + ${RPSRC}/hx2750_base-r25.patch;patch=1 \ + ${RPSRC}/hx2750_bl-r7.patch;patch=1 \ ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \ ${RPSRC}/pxa_keys-r5.patch;patch=1 \ ${RPSRC}/tsc2101-r12.patch;patch=1 \ ${RPSRC}/hx2750_test1-r3.patch;patch=1 \ ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ ${RPSRC}/input_power-r5.patch;patch=1 \ - ${RPSRC}/jffs2_longfilename-r1.patch;patch=1 \ ${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \ - ${RPSRC}/collie_frontlight-r4.patch;patch=1 \ - ${RPSRC}/zaurus_reboot-r1.patch;patch=1 \ ${RPSRC}/sharpsl_pm_fixes1-r0.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 \ ${RPSRC}/usb_add_epalloc-r1.patch;patch=1 \ ${DOSRC}/kexec-arm-r2.patch;patch=1 \ + ${RPSRC}/locomo_kbd_tweak-r0.patch;patch=1 \ + ${RPSRC}/poodle_pm-r1.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ file://hrw-pcmcia-ids-r2.patch;patch=1 \ - file://locomo-kbd-hotkeys.patch;patch=1 \ - file://locomo-sysrq+keyrepeat.patch;patch=1 \ - file://locomo-lcd-def-bightness.patch;patch=1 \ - ${RPSRC}/locomo_led_default_trigger-r0.patch;patch=1 \ - ${RPSRC}/poodle_mmcsd_fix-r0.patch;patch=1 \ - ${RPSRC}/poodle_ssp-r1.patch;patch=1 \ - ${RPSRC}/poodle_pm-r0.patch;patch=1 \ ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \ diff --git a/packages/lm_sensors/files/.mtn2git_empty b/packages/lm_sensors/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/lm_sensors/files/.mtn2git_empty diff --git a/packages/lm_sensors/files/add-sysfs-ldflags.patch b/packages/lm_sensors/files/add-sysfs-ldflags.patch new file mode 100644 index 0000000000..25f13d8d4c --- /dev/null +++ b/packages/lm_sensors/files/add-sysfs-ldflags.patch @@ -0,0 +1,20 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- lm_sensors-2.10.0/lib/Module.mk~add-sysfs-ldflags ++++ lm_sensors-2.10.0/lib/Module.mk +@@ -66,10 +66,10 @@ + # How to create the shared library + ifdef SYSFS_SUPPORT + $(MODULE_DIR)/$(LIBSHLIBNAME): $(LIBSHOBJECTS) +- $(CC) -shared -Wl,-soname,$(LIBSHSONAME) -o $@ $^ -lc -lm -lsysfs ++ $(CC) $(LDFLAGS) -shared -Wl,-soname,$(LIBSHSONAME) -o $@ $^ -lc -lm -lsysfs + else + $(MODULE_DIR)/$(LIBSHLIBNAME): $(LIBSHOBJECTS) +- $(CC) -shared -Wl,-soname,$(LIBSHSONAME) -o $@ $^ -lc -lm ++ $(CC) $(LDFLAGS) -shared -Wl,-soname,$(LIBSHSONAME) -o $@ $^ -lc -lm + endif + + $(MODULE_DIR)/$(LIBSHSONAME): $(MODULE_DIR)/$(LIBSHLIBNAME) diff --git a/packages/lm_sensors/lmsensors-apps_2.10.0.bb b/packages/lm_sensors/lmsensors-apps_2.10.0.bb new file mode 100644 index 0000000000..23695700c1 --- /dev/null +++ b/packages/lm_sensors/lmsensors-apps_2.10.0.bb @@ -0,0 +1,30 @@ +# lmsensors-apps .bb build file +# Copyright (C) 2006, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see /COPYING) + +DESCRIPTION = "Hardware health monitoring applications" +HOMEPAGE = "http://secure.netroedge.com/~lm78/" +MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>" +DEPENDS = "libsysfs" +LICENSE = "GPL" + +SRC_URI = "http://secure.netroedge.com/~lm78/archive/lm_sensors-${PV}.tar.gz \ + file://add-sysfs-ldflags.patch;patch=1" +S = "${WORKDIR}/lm_sensors-${PV}" + +do_compile() { + oe_runmake LINUX=${STAGING_KERNEL_DIR} EXLDFLAGS="${LDFLAGS}" user +} + +APPS = "${S}/prog/dump/i2cdump ${S}/prog/dump/i2cset ${S}/prog/detect/i2cdetect" + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${APPS} ${D}${bindir} +} + +PACKAGES="sensors-i2cdump sensors-i2cset sensors-i2cdetect" + +FILES_sensors-i2cdump="${bindir}/i2cdump" +FILES_sensors-i2cset="${bindir}/i2cset" +FILES_sensors-i2cdetect="${bindir}/i2cdetect" diff --git a/packages/lm_sensors/lmsensors-apps_2.9.2.bb b/packages/lm_sensors/lmsensors-apps_2.9.2.bb index cc5dfe4ff7..24822cdefa 100644 --- a/packages/lm_sensors/lmsensors-apps_2.9.2.bb +++ b/packages/lm_sensors/lmsensors-apps_2.9.2.bb @@ -2,31 +2,27 @@ # Copyright (C) 2006, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see /COPYING) -HOMEPAGE="http://secure.netroedge.com/~lm78/" -DESCRIPTION="Hardware health monitoring applications" +DESCRIPTION = "Hardware health monitoring applications" +HOMEPAGE = "http://secure.netroedge.com/~lm78/" MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>" LICENSE = "GPL" -SRC_URI="http://secure.netroedge.com/~lm78/archive/lm_sensors-${PV}.tar.gz" - -S="${WORKDIR}/lm_sensors-${PV}" - -PACKAGES="sensors-i2cdump sensors-i2cset sensors-i2cdetect" - -FILES_sensors-i2cdump="${bindir}/i2cdump" -FILES_sensors-i2cset="${bindir}/i2cset" -FILES_sensors-i2cdetect="${bindir}/i2cdetect" - -do_configure() { -} +SRC_URI = "http://secure.netroedge.com/~lm78/archive/lm_sensors-${PV}.tar.gz" +S = "${WORKDIR}/lm_sensors-${PV}" do_compile() { oe_runmake LINUX=${STAGING_KERNEL_DIR} user } -APPS="${S}/prog/dump/i2cdump ${S}/prog/dump/i2cset ${S}/prog/detect/i2cdetect" +APPS = "${S}/prog/dump/i2cdump ${S}/prog/dump/i2cset ${S}/prog/detect/i2cdetect" do_install() { install -d ${D}${bindir} install -m 0755 ${APPS} ${D}${bindir} } + +PACKAGES="sensors-i2cdump sensors-i2cset sensors-i2cdetect" +FILES_sensors-i2cdump="${bindir}/i2cdump" +FILES_sensors-i2cset="${bindir}/i2cset" +FILES_sensors-i2cdetect="${bindir}/i2cdetect" + diff --git a/packages/openldap/files/initscript b/packages/openldap/files/initscript new file mode 100644 index 0000000000..40881cd6d7 --- /dev/null +++ b/packages/openldap/files/initscript @@ -0,0 +1,29 @@ +#! /bin/sh +# +# This is an init script for openembedded +# Copy it to /etc/init.d/openldap and type +# > update-rc.d openldap defaults 60 +# + + +slapd=/usr/libexec/slapd +test -x "$slapd" || exit 0 + + +case "$1" in + start) + echo -n "Starting OpenLDAP: " + start-stop-daemon --start --quiet --exec $slapd + echo "." + ;; + stop) + echo -n "Stopping OpenLDAP: " + start-stop-daemon --stop --quiet --pidfile /var/run/slapd.pid + echo "." + ;; + *) + echo "Usage: /etc/init.d/openldap {start|stop}" + exit 1 +esac + +exit 0
\ No newline at end of file diff --git a/packages/openldap/openldap_2.3.11.bb b/packages/openldap/openldap_2.3.11.bb index f15de41116..26d017fb1e 100644 --- a/packages/openldap/openldap_2.3.11.bb +++ b/packages/openldap/openldap_2.3.11.bb @@ -12,12 +12,13 @@ PRIORITY = "optional" LICENSE = "OpenLDAP" SECTION = "libs" -PR = "r1" +PR = "r2" LDAP_VER = "${@'.'.join(bb.data.getVar('PV',d,1).split('.')[0:2])}" SRC_URI = "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz" SRC_URI += "file://openldap-m4-pthread.patch;patch=1" +SCR-URI += "file://initscript"; # The build tries to run a host executable, this fails. The patch # causes the executable and its data to be installed instead of # the output - ucgendat must be run after the ipkg install! @@ -263,6 +264,23 @@ FILES_${PN}-bin = "${bindir}" FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libexecdir}/openldap/*.a" do_install_append() { + install -d ${D}${sysconfdir}/init.d + cat ${WORKDIR}/initscript > ${D}${sysconfdir}/init.d/openldap + chmod 755 ${D}${sysconfdir}/init.d/openldap # This is duplicated in /etc/openldap and is for slapd rm -f ${D}${localstatedir}/openldap-data/DB_CONFIG.example } + +pkg_postinst () { + if test -n "${D}"; then + D="-r $D" + fi + update-rc.d $D acpid defaults +} + +pkg_prerm () { + if test -n "${D}"; then + D="-r $D" + fi + update-rc.d $D acpid remove +} diff --git a/packages/sysfsutils/sysfsutils_1.1.0.bb b/packages/sysfsutils/sysfsutils_1.1.0.bb deleted file mode 100644 index 9168347112..0000000000 --- a/packages/sysfsutils/sysfsutils_1.1.0.bb +++ /dev/null @@ -1,14 +0,0 @@ -SECTION = "base" -SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz" -S = "${WORKDIR}/sysfsutils-${PV}" -LICENSE = "GPL" -inherit autotools - -includedir += "/sysfs" - -do_stage () { - oe_libinstall -a -so -C lib libsysfs ${STAGING_LIBDIR} - install -d ${STAGING_INCDIR}/sysfs - install -m 0644 ${S}/include/dlist.h ${STAGING_INCDIR}/sysfs - install -m 0644 ${S}/include/libsysfs.h ${STAGING_INCDIR}/sysfs -} diff --git a/packages/sysfsutils/sysfsutils_1.2.0.bb b/packages/sysfsutils/sysfsutils_1.2.0.bb deleted file mode 100644 index 8c70551404..0000000000 --- a/packages/sysfsutils/sysfsutils_1.2.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -SECTION = "base" -DESCRIPTION = "System Utilities Based on Sysfs" -HOMEPAGE = "http://linux-diag.sourceforge.net/Sysfsutils.html" -LICENSE = "GPLv2" -SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz \ - file://libsysfs-write-attribute.patch;patch=1" -S = "${WORKDIR}/sysfsutils-${PV}" -PR = "r1" - -inherit autotools - -includedir += "/sysfs" - -PACKAGES_prepend = "libsysfs " -FILES_libsysfs = "${libdir}/*.so.1.0.2" - -do_stage () { - oe_libinstall -a -so -C lib libsysfs ${STAGING_LIBDIR} - install -d ${STAGING_INCDIR}/sysfs - install -m 0644 ${S}/include/dlist.h ${STAGING_INCDIR}/sysfs - install -m 0644 ${S}/include/libsysfs.h ${STAGING_INCDIR}/sysfs -} diff --git a/packages/sysfsutils/sysfsutils_2.0.0.bb b/packages/sysfsutils/sysfsutils_2.0.0.bb index 176c8870e4..1c0bb8bbce 100644 --- a/packages/sysfsutils/sysfsutils_2.0.0.bb +++ b/packages/sysfsutils/sysfsutils_2.0.0.bb @@ -1,23 +1,22 @@ -DEFAULT_PREFERENCE = "-1" - -SECTION = "base" DESCRIPTION = "System Utilities Based on Sysfs" HOMEPAGE = "http://linux-diag.sourceforge.net/Sysfsutils.html" LICENSE = "GPLv2" -SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz" +PROVIDES = "libsysfs" +SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz" S = "${WORKDIR}/sysfsutils-${PV}" inherit autotools includedir += "/sysfs" -PACKAGES_prepend = "libsysfs " -FILES_libsysfs = "${libdir}/*.so.2.0.0" - do_stage () { oe_libinstall -a -so -C lib libsysfs ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/sysfs install -m 0644 ${S}/include/dlist.h ${STAGING_INCDIR}/sysfs install -m 0644 ${S}/include/libsysfs.h ${STAGING_INCDIR}/sysfs } + +PACKAGES_prepend = "libsysfs " +FILES_libsysfs = "${libdir}/*.so.2.0.0" + |