[oe-commits] org.oe.dev merge of '0f34f029ae013c8424b0693e3c1017d67649c235'
oe commit
oe at amethyst.openembedded.net
Sun Jun 8 03:38:49 UTC 2008
merge of '0f34f029ae013c8424b0693e3c1017d67649c235'
and '5d3853ec3fe837b91ad1001620a445344aeae8d8'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 0ddda5e4e5a2e4348e19a26fbda8a4119de7fe6e
ViewMTN: http://monotone.openembedded.org/revision/info/0ddda5e4e5a2e4348e19a26fbda8a4119de7fe6e
Files:
1
packages/keymaps/files/tosa/keymap-2.6.map
packages/keymaps/keymaps_1.0.bb
packages/dropbear/dropbear-0.50
packages/dropbear/dropbear-0.51
packages/dropbear/dropbear_0.50.bb
packages/dropbear/dropbear_0.51.bb
packages/handsfree
packages/handsfree/files
packages/dropbear/dropbear-0.51/allow-nopw.patch
packages/handsfree/files/Makefile.patch
packages/handsfree/handsfree_0.1.bb
packages/bluesnarfer/bluesnarfer.bb
packages/dropbear/dropbear.inc
Diffs:
#
# mt diff -r0f34f029ae013c8424b0693e3c1017d67649c235 -r0ddda5e4e5a2e4348e19a26fbda8a4119de7fe6e
#
#
#
# patch "packages/keymaps/files/tosa/keymap-2.6.map"
# from [d31f331d2aa8f5c3b6a525e6d896254e0de31b80]
# to [ca6f9018b4349221c754ec336da113b01066f05b]
#
# patch "packages/keymaps/keymaps_1.0.bb"
# from [3ca60513019e86146c6189d1b3436b35b168c96b]
# to [5dbbf11e709fbfd0c371921a5f538d7f93867ec3]
#
============================================================
--- packages/keymaps/files/tosa/keymap-2.6.map d31f331d2aa8f5c3b6a525e6d896254e0de31b80
+++ packages/keymaps/files/tosa/keymap-2.6.map ca6f9018b4349221c754ec336da113b01066f05b
@@ -1,297 +1,123 @@ keymaps 0-2,4-5,8,12
# Default kernel keymap. This uses 7 modifier combinations.
keymaps 0-2,4-5,8,12
+# Change the above line into
+# keymaps 0-2,4-6,8,12
+# in case you want the entries
+# altgr control keycode 83 = Boot
+# altgr control keycode 111 = Boot
+# below.
#
-keycode 1 = Escape Escape
-# alt keycode 1 = Meta_Escape
-#keycode 2 = one exclam
-# alt keycode 2 = Meta_one
-#keycode 3 = two at at
-# control keycode 3 = nul
-# shift control keycode 3 = nul
-# alt keycode 3 = Meta_two
-#keycode 4 = three numbersign
-# control keycode 4 = Escape
-# alt keycode 4 = Meta_three
-#keycode 5 = four dollar dollar
-# control keycode 5 = Control_backslash
-# alt keycode 5 = Meta_four
-#keycode 6 = five percent
-# control keycode 6 = Control_bracketright
-# alt keycode 6 = Meta_five
-#keycode 7 = six asciicircum
-# control keycode 7 = Control_asciicircum
-# alt keycode 7 = Meta_six
-#keycode 8 = seven ampersand braceleft
-# control keycode 8 = Control_underscore
-# alt keycode 8 = Meta_seven
-#keycode 9 = eight asterisk bracketleft
-# control keycode 9 = Delete
-# alt keycode 9 = Meta_eight
-#keycode 10 = nine parenleft bracketright
-# alt keycode 10 = Meta_nine
-#keycode 11 = zero parenright braceright
-# alt keycode 11 = Meta_zero
-#keycode 12 = minus underscore backslash
-# control keycode 12 = Control_underscore
-# shift control keycode 12 = Control_underscore
-# alt keycode 12 = Meta_minus
-#keycode 13 = equal plus
-# alt keycode 13 = Meta_equal
-keycode 14 = BackSpace BackSpace
- altgr keycode 14 = Delete
-#keycode 14 = Delete Delete
-# control keycode 14 = BackSpace
-# alt keycode 14 = Meta_Delete
-keycode 15 = Tab Tab
- altgr keycode 15 = Caps_Lock
-keycode 16 = q
- altgr keycode 16 = one
-keycode 17 = w
- altgr keycode 17 = two
-keycode 18 = e
- altgr keycode 18 = three
-# altgr keycode 18 = Hex_E
-keycode 19 = r
- altgr keycode 19 = four
-keycode 20 = t
- altgr keycode 20 = five
-keycode 21 = y
- altgr keycode 21 = six
-keycode 22 = u
- altgr keycode 22 = seven
-keycode 23 = i
- altgr keycode 23 = eight
-keycode 24 = o
- altgr keycode 24 = nine
-keycode 25 = p
- altgr keycode 25 = zero
-#keycode 26 = bracketleft braceleft
-# control keycode 26 = Escape
-# alt keycode 26 = Meta_bracketleft
-#keycode 27 = bracketright braceright asciitilde
-# control keycode 27 = Control_bracketright
-# alt keycode 27 = Meta_bracketright
-keycode 28 = Return
- altgr keycode 28 = greater
-# alt keycode 28 = Meta_Control_m
-keycode 29 = Control
-keycode 30 = a
- altgr keycode 30 = exclam
-# altgr keycode 30 = Hex_A
-keycode 31 = s
- altgr keycode 31 = at
-keycode 32 = d
- altgr keycode 32 = numbersign
-# altgr keycode 32 = Hex_D
-keycode 33 = f
- altgr keycode 33 = dollar
-# altgr keycode 33 = Hex_F
-keycode 34 = g
- altgr keycode 34 = percent
-keycode 35 = h
- altgr keycode 35 = underscore
-keycode 36 = j
- altgr keycode 36 = ampersand
-keycode 37 = k
- altgr keycode 37 = asterisk
-keycode 38 = l
- altgr keycode 38 = parenleft
-#keycode 39 = semicolon colon
-# alt keycode 39 = Meta_semicolon
-keycode 40 = apostrophe quotedbl
- altgr keycode 40 = asciitilde
-# control keycode 40 = Control_g
-# alt keycode 40 = Meta_apostrophe
-#keycode 41 = grave asciitilde
-# control keycode 41 = nul
-# alt keycode 41 = Meta_grave
-keycode 42 = Shift
-#keycode 43 = backslash bar
-# control keycode 43 = Control_backslash
-# alt keycode 43 = Meta_backslash
-keycode 44 = z
-## alt keycode 44 =
-keycode 45 = x
- altgr keycode 45 = Control_x
-keycode 46 = c
- altgr keycode 46 = Control_c
-# altgr keycode 46 = Hex_C
-keycode 47 = v
- altgr keycode 47 = Control_v
-keycode 48 = b
- altgr keycode 48 = minus
-# altgr keycode 48 = Hex_B
-keycode 49 = n
- altgr keycode 49 = plus
-keycode 50 = m
- altgr keycode 50 = equal
-keycode 51 = comma semicolon
- altgr keycode 51 = parenright
-#keycode 51 = comma less
-# alt keycode 51 = Meta_comma
-keycode 52 = period colon
- control keycode 52 = Compose
- altgr keycode 52 = less
-#keycode 52 = period greater
-# control keycode 52 = Compose
-# alt keycode 52 = Meta_period
-keycode 53 = slash question
- altgr keycode 53 = Num_Lock
-# control keycode 53 = Delete
-# alt keycode 53 = Meta_slash
-keycode 54 = Shift
-#keycode 55 = KP_Multiply
-#keycode 56 = Alt
-keycode 57 = space space
- altgr keycode 57 = bar
-# control keycode 57 = nul
-# alt keycode 57 = Meta_space
-#keycode 58 = Caps_Lock
-#keycode 59 = F1 F11 Console_13
-# control keycode 59 = F1
-# alt keycode 59 = Console_1
-# control alt keycode 59 = Console_1
-#keycode 60 = F2 F12 Console_14
-# control keycode 60 = F2
-# alt keycode 60 = Console_2
-# control alt keycode 60 = Console_2
-#keycode 61 = F3 F13 Console_15
-# control keycode 61 = F3
-# alt keycode 61 = Console_3
-# control alt keycode 61 = Console_3
-#keycode 62 = F4 F14 Console_16
-# control keycode 62 = F4
-# alt keycode 62 = Console_4
-# control alt keycode 62 = Console_4
-#keycode 63 = F5 F15 Console_17
-# control keycode 63 = F5
-# alt keycode 63 = Console_5
-# control alt keycode 63 = Console_5
-#keycode 64 = F6 F16 Console_18
-# control keycode 64 = F6
-# alt keycode 64 = Console_6
-# control alt keycode 64 = Console_6
-#keycode 65 = F7 F17 Console_19
-# control keycode 65 = F7
-# alt keycode 65 = Console_7
-# control alt keycode 65 = Console_7
-#keycode 66 = F8 F18 Console_20
-# control keycode 66 = F8
-# alt keycode 66 = Console_8
-# control alt keycode 66 = Console_8
-#keycode 67 = F9 F19 Console_21
-# control keycode 67 = F9
-# alt keycode 67 = Console_9
-# control alt keycode 67 = Console_9
-#keycode 68 = F10 F20 Console_22
-# control keycode 68 = F10
-# alt keycode 68 = Console_10
-# control alt keycode 68 = Console_10
-#keycode 69 = Num_Lock
-# shift keycode 69 = Bare_Num_Lock
-#keycode 70 = Scroll_Lock Show_Memory Show_Registers
-# control keycode 70 = Show_State
-# alt keycode 70 = Scroll_Lock
-#keycode 71 = KP_7
-# alt keycode 71 = Ascii_7
-# altgr keycode 71 = Hex_7
-#keycode 72 = KP_8
-# alt keycode 72 = Ascii_8
-# altgr keycode 72 = Hex_8
-#keycode 73 = KP_9
-# alt keycode 73 = Ascii_9
-# altgr keycode 73 = Hex_9
-#keycode 74 = KP_Subtract
-#keycode 75 = KP_4
-# alt keycode 75 = Ascii_4
-# altgr keycode 75 = Hex_4
-#keycode 76 = KP_5
-# alt keycode 76 = Ascii_5
-# altgr keycode 76 = Hex_5
-#keycode 77 = KP_6
-# alt keycode 77 = Ascii_6
-# altgr keycode 77 = Hex_6
-#keycode 78 = KP_Add
-#keycode 79 = KP_1
-# alt keycode 79 = Ascii_1
-# altgr keycode 79 = Hex_1
-#keycode 80 = KP_2
-# alt keycode 80 = Ascii_2
-# altgr keycode 80 = Hex_2
-#keycode 81 = KP_3
-# alt keycode 81 = Ascii_3
-# altgr keycode 81 = Hex_3
-#keycode 82 = KP_0
-# alt keycode 82 = Ascii_0
-# altgr keycode 82 = Hex_0
-#keycode 83 = KP_Period
-## altgr control keycode 83 = Boot
-# control alt keycode 83 = Boot
-#keycode 84 = Last_Console
-#keycode 85 =
-#keycode 86 = less greater bar
-# alt keycode 86 = Meta_less
-#keycode 87 = F11 F11 Console_23
-# control keycode 87 = F11
-# alt keycode 87 = Console_11
-# control alt keycode 87 = Console_11
-#keycode 88 = F12 F12 Console_24
-# control keycode 88 = F12
-# alt keycode 88 = Console_12
-# control alt keycode 88 = Console_12
-#keycode 89 =
-#keycode 90 =
-keycode 91 = space
-#keycode 91 =
-keycode 92 = Return
-#keycode 92 =
-#keycode 93 =
-#keycode 94 =
-#keycode 95 =
-#keycode 96 = KP_Enter
-#keycode 97 = Control
-#keycode 98 = KP_Divide
-#keycode 99 = Control_backslash
-# control keycode 99 = Control_backslash
-# alt keycode 99 = Control_backslash
-keycode 100 = AltGr
-#keycode 101 = Break
-#keycode 102 = Find
-keycode 103 = Up
- altgr keycode 103 = Prior
- shift keycode 104 = Scroll_Backward
-#keycode 104 = Prior
-# shift keycode 104 = Scroll_Backward
-keycode 105 = Left
- altgr keycode 105 = Decr_Console
-keycode 106 = Right
- altgr keycode 106 = Incr_Console
-#keycode 107 = Select
-keycode 108 = Down
- altgr keycode 108 = Next
- shift keycode 108 = Scroll_Forward
-#keycode 109 = Next
-# shift keycode 109 = Scroll_Forward
-#keycode 110 = Insert
-#keycode 111 = Remove
-## altgr control keycode 111 = Boot
-# control alt keycode 111 = Boot
-#keycode 112 = Macro
-#keycode 113 = F13
-#keycode 114 = F14
-#keycode 115 = Help
-#keycode 116 = Do
-#keycode 117 = F17
-#keycode 118 = KP_MinPlus
-#keycode 119 = Pause
-#keycode 120 =
-#keycode 121 =
-#keycode 122 =
-#keycode 123 =
-#keycode 124 =
-#keycode 125 =
-#keycode 126 =
-#keycode 127 =
+keycode 1 =
+keycode 14 = BackSpace
+ altgr keycode 14 = Delete
+keycode 15 = Tab
+ altgr keycode 15 = Caps_Lock
+keycode 16 = q
+ altgr keycode 16 = one
+keycode 17 = w
+ altgr keycode 17 = two
+keycode 18 = e
+ altgr keycode 18 = three
+keycode 19 = r
+ altgr keycode 19 = four
+keycode 20 = t
+ altgr keycode 20 = five
+keycode 21 = y
+ altgr keycode 21 = six
+keycode 22 = u
+ altgr keycode 22 = seven
+keycode 23 = i
+ altgr keycode 23 = eight
+keycode 24 = o
+ altgr keycode 24 = nine
+keycode 25 = p
+ altgr keycode 25 = zero
+keycode 26 =
+keycode 27 =
+keycode 28 = Return
+ altgr keycode 28 = greater
+keycode 29 = Control
+keycode 30 = a
+ altgr keycode 30 = exclam
+keycode 31 = s
+ altgr keycode 31 = at
+keycode 32 = d
+ altgr keycode 32 = numbersign
+keycode 33 = f
+ altgr keycode 33 = dollar
+keycode 34 = g
+ altgr keycode 34 = percent
+keycode 35 = h
+ altgr keycode 35 = underscore
+keycode 36 = j
+ altgr keycode 36 = ampersand
+keycode 37 = k
+ altgr keycode 37 = asterisk
+keycode 38 = l
+ altgr keycode 38 = parenleft
+keycode 39 =
+keycode 40 = apostrophe quotedbl
+ altgr keycode 40 = asciitilde
+keycode 41 =
+keycode 42 = Shift
+keycode 43 =
+keycode 44 = z
+ altgr keycode 44 = backslash
+keycode 45 = x
+keycode 46 = c
+ altgr keycode 46 = Control_c
+keycode 47 = v
+ altgr keycode 47 = Control_v
+keycode 48 = b
+ altgr keycode 48 = minus
+keycode 49 = n
+ altgr keycode 49 = plus
+keycode 50 = m
+ altgr keycode 50 = equal
+keycode 51 = comma semicolon
+ altgr keycode 51 = parenright
+keycode 52 = period colon
+ altgr keycode 52 = less
+ control keycode 52 = Compose
+keycode 53 = slash question
+ altgr keycode 53 = Num_Lock
+keycode 54 = Shift
+keycode 55 =
+keycode 56 = Alt
+keycode 57 = space space
+ altgr keycode 57 = bar
+keycode 58 =
+keycode 59 = F9 # Calendar
+ altgr keycode 59 = braceleft
+keycode 60 = F10 # Contact
+ altgr keycode 60 = bracketleft
+keycode 61 = AltGr # Fn
+keycode 62 = Escape # Cancel
+keycode 63 = space # Bulleye
+keycode 64 = Control # Dot
+keycode 65 = F15 # Backlight/Rotate
+ altgr keycode 65 = asciicircum
+keycode 66 = F24 # Rec
+keycode 67 = F12 # Home
+ altgr keycode 67 = grave
+keycode 68 = F13 # Email
+ altgr keycode 68 = braceright
+keycode 79 = F15
+keycode 80 = F16
+keycode 82 = F17
+keycode 87 = Return # OK
+keycode 88 = F11 # Menu
+ altgr keycode 88 = bracketright
+keycode 97 = Control
+keycode 99 = F12
+keycode 103 = Up Scroll_Backward
+ altgr keycode 103 = PageUp
+keycode 105 = Left Prior
+ altgr keycode 105 = Decr_Console
+keycode 106 = Right Next
+ altgr keycode 106 = Incr_Console
+keycode 108 = Down Scroll_Forward
+ altgr keycode 108 = PageDown
string F1 = "\033[[A"
string F2 = "\033[[B"
string F3 = "\033[[C"
============================================================
--- packages/keymaps/keymaps_1.0.bb 3ca60513019e86146c6189d1b3436b35b168c96b
+++ packages/keymaps/keymaps_1.0.bb 5dbbf11e709fbfd0c371921a5f538d7f93867ec3
@@ -3,7 +3,7 @@ PACKAGE_ARCH = "${MACHINE}"
RDEPENDS = "initscripts console-tools"
LICENSE = "GPL"
PACKAGE_ARCH = "${MACHINE}"
-PR = "r19"
+PR = "r20"
inherit update-rc.d
#
# mt diff -r5d3853ec3fe837b91ad1001620a445344aeae8d8 -r0ddda5e4e5a2e4348e19a26fbda8a4119de7fe6e
#
#
#
# rename "packages/dropbear/dropbear-0.50"
# to "packages/dropbear/dropbear-0.51"
#
# rename "packages/dropbear/dropbear_0.50.bb"
# to "packages/dropbear/dropbear_0.51.bb"
#
# add_dir "packages/handsfree"
#
# add_dir "packages/handsfree/files"
#
# add_file "packages/dropbear/dropbear-0.51/allow-nopw.patch"
# content [c5ccbb00c5a8e24ff7177af9bffdda9110038b88]
#
# add_file "packages/handsfree/files/Makefile.patch"
# content [439341a82ade64343c72a93235f03635a6bb14f5]
#
# add_file "packages/handsfree/handsfree_0.1.bb"
# content [d36308d10dc175fe42a71aba4dc75b9f216bea8e]
#
# patch "packages/bluesnarfer/bluesnarfer.bb"
# from [054791dddcd30de975ecb4ae0941514df3a94a8a]
# to [167efb7d04806b17a766a17f4716ec0e79b74027]
#
# patch "packages/dropbear/dropbear.inc"
# from [6d50c1193e4d2fa9a7c6f85db6149b36aee06851]
# to [8974ff1e11e258705f1ba627535481893748e0b1]
#
# patch "packages/dropbear/dropbear_0.51.bb"
# from [61b1e18c0d8254b164c4d1ed3bf6b6b20d9fc200]
# to [b4549d3c7ecf3920758e70e164410850ae6bebe8]
#
============================================================
--- packages/dropbear/dropbear-0.51/allow-nopw.patch c5ccbb00c5a8e24ff7177af9bffdda9110038b88
+++ packages/dropbear/dropbear-0.51/allow-nopw.patch c5ccbb00c5a8e24ff7177af9bffdda9110038b88
@@ -0,0 +1,40 @@
+Index: dropbear-0.51/svr-auth.c
+===================================================================
+--- dropbear-0.51.orig/svr-auth.c
++++ dropbear-0.51/svr-auth.c
+@@ -270,7 +270,7 @@ static int checkusername(unsigned char *
+ send_msg_userauth_failure(0, 1);
+ return DROPBEAR_FAILURE;
+ }
+-
++#ifdef DISALLOW_EMPTY_PW
+ /* check for an empty password */
+ if (ses.authstate.pw_passwd[0] == '\0') {
+ TRACE(("leave checkusername: empty pword"))
+@@ -279,7 +279,7 @@ static int checkusername(unsigned char *
+ send_msg_userauth_failure(0, 1);
+ return DROPBEAR_FAILURE;
+ }
+-
++#endif
+ TRACE(("shell is %s", ses.authstate.pw_shell))
+
+ /* check that the shell is set */
+Index: dropbear-0.51/svr-authpasswd.c
+===================================================================
+--- dropbear-0.51.orig/svr-authpasswd.c
++++ dropbear-0.51/svr-authpasswd.c
+@@ -64,9 +64,13 @@ void svr_auth_password() {
+ * since the shadow password may differ to that tested
+ * in auth.c */
+ if (passwdcrypt[0] == '\0') {
++#ifdef DISALLOW_EMPTY_PW
+ dropbear_log(LOG_WARNING, "user '%s' has blank password, rejected",
+ ses.authstate.pw_name);
+ send_msg_userauth_failure(0, 1);
++#else
++ send_msg_userauth_success();
++#endif
+ return;
+ }
+
============================================================
--- packages/handsfree/files/Makefile.patch 439341a82ade64343c72a93235f03635a6bb14f5
+++ packages/handsfree/files/Makefile.patch 439341a82ade64343c72a93235f03635a6bb14f5
@@ -0,0 +1,19 @@
+--- handsfree/old/Makefile 2006-11-21 18:01:13.000000000 +0000
++++ handsfree/Makefile 2006-11-21 14:01:17.000000000 +0000
+@@ -9,12 +9,12 @@
+ # I use a dmixer as default alsa device to mix
+ # the handsfree output with other sound playback
+ #
+-ALSA_PLAY="default"
+-ALSA_REC="plughw:0,0"
++#ALSA_PLAY="default"
++#ALSA_REC="plughw:0,0"
+
+
+-LDFLAGS= -lbluetooth -lasound
+-CFLAGS=-g -Wall -DOSS=0
++#LDFLAGS= -lbluetooth -lasound
++#CFLAGS=-g -Wall -DOSS=0
+
+ all: handsfree headset
+
============================================================
--- packages/handsfree/handsfree_0.1.bb d36308d10dc175fe42a71aba4dc75b9f216bea8e
+++ packages/handsfree/handsfree_0.1.bb d36308d10dc175fe42a71aba4dc75b9f216bea8e
@@ -0,0 +1,32 @@
+DESCRIPTION = "Handsfree and Handset Bluetooth tool"
+HOMEPAGE = "http://www.soft.uni-linz.ac.at/_wiki/tiki-index.php?page=ProjectBluezHandsfree"
+SECTION = "network/misc"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+DEPENDS= "bluez-libs alsa-lib"
+PR = "r0"
+
+
+SRC_URI = "\
+ http://www.soft.uni-linz.ac.at/~vogl/bluez/handsfree-040326.tar.gz \
+ file://Makefile.patch;patch=1 \
+"
+S = "${WORKDIR}/handsfree"
+
+# Alsa devices
+# Example: "plughw:0,0"
+ALSA_PLAY = "default"
+ALSA_REC = "default"
+
+CFLAGS =+ "-DOSS=0 "
+LDFLAGS =+ "-lbluetooth -lasound "
+
+do_compile() {
+ oe_runmake all
+}
+
+do_install() {
+ install -d ${D}${bindir}
+ install -m 0755 handsfree ${D}${bindir}
+ install -m 0755 headset ${D}${bindir}
+}
============================================================
--- packages/bluesnarfer/bluesnarfer.bb 054791dddcd30de975ecb4ae0941514df3a94a8a
+++ packages/bluesnarfer/bluesnarfer.bb 167efb7d04806b17a766a17f4716ec0e79b74027
@@ -1,17 +1,14 @@
+DESCRIPTION = "Bluetooth cellphone information gatherer"
+LICENSE = "GPL"
SECTION = "network/misc"
-DESCRIPTION = "Bluetooth cellphone information gatherer"
+DEPENDS = "bluez-libs"
PV = "0.1"
-SRC_URI = "http://www.remote-exploit.org/images/a/a0/Bluesnarfer.tar.gz"
-DEFAULT_PREFERENCE="-1"
+SRC_URI = "http://www.alighieri.org/tools/bluesnarfer.tar.gz"
+S = "${WORKDIR}/bluesnarfer"
+LDFLAGS =+ "-lbluetooth"
-CFLAGS_prepend = "-I${STAGING_INCDIR}/bluetooth "
-
-LDFLAGS_prepend = "-lbluetooth -L${STAGING_LIBDIR} "
-
-S = "${WORKDIR}/bluesnarfer"
-LICENSE = "GPL"
do_compile() {
oe_runmake bluesnarfer
}
@@ -20,4 +17,3 @@ do_install() {
install -d ${D}${bindir}
install -m 0755 ${S}/bluesnarfer ${D}${bindir}
}
-
============================================================
--- packages/dropbear/dropbear.inc 6d50c1193e4d2fa9a7c6f85db6149b36aee06851
+++ packages/dropbear/dropbear.inc 8974ff1e11e258705f1ba627535481893748e0b1
@@ -6,19 +6,21 @@ RPROVIDES = "ssh sshd"
PROVIDES = "ssh sshd"
RPROVIDES = "ssh sshd"
-SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \
- file://urandom-xauth-changes-to-options.h.patch;patch=1 \
- file://configure.patch;patch=1 \
- file://fix-2kb-keys.patch;patch=1 \
- file://allow-nopw.patch \
- file://init"
+SRC_URI = "\
+ http://matt.ucc.asn.au/dropbear/dropbear-${PV}.tar.bz2 \
+ file://urandom-xauth-changes-to-options.h.patch;patch=1 \
+ file://configure.patch;patch=1 \
+ file://fix-2kb-keys.patch;patch=1 \
+ file://allow-nopw.patch \
+ file://init \
+"
inherit autotools update-rc.d
INITSCRIPT_NAME = "dropbear"
INITSCRIPT_PARAMS = "defaults 10"
-CFLAGS_prepend = " -I. "
+CFLAGS =+ "-I."
LD = "${CC}"
SBINCOMMANDS = "dropbear dropbearkey dropbearconvert"
@@ -33,13 +35,13 @@ do_install() {
}
do_install() {
- install -d ${D}${sysconfdir} \
- ${D}${sysconfdir}/init.d \
- ${D}${sysconfdir}/default \
- ${D}${sysconfdir}/dropbear \
- ${D}${bindir} \
- ${D}${sbindir} \
- ${D}${localstatedir}
+ install -d ${D}${sysconfdir}
+ install -d ${D}${sysconfdir}/init.d
+ install -d ${D}${sysconfdir}/default
+ install -d ${D}${sysconfdir}/dropbear
+ install -d ${D}${bindir}
+ install -d ${D}${sbindir}
+ install -d ${D}${localstatedir}
install -m 0755 dropbearmulti ${D}${sbindir}/
ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient
@@ -62,12 +64,12 @@ pkg_postrm_append () {
}
pkg_postrm_append () {
- if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then
- rm ${sysconfdir}/dropbear/dropbear_rsa_host_key
- fi
- if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then
- rm ${sysconfdir}/dropbear/dropbear_dss_host_key
- fi
- update-alternatives --remove ssh ${bindir}/dropbearmulti
- update-alternatives --remove scp ${bindir}/dropbearmulti
+ if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then
+ rm ${sysconfdir}/dropbear/dropbear_rsa_host_key
+ fi
+ if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then
+ rm ${sysconfdir}/dropbear/dropbear_dss_host_key
+ fi
+ update-alternatives --remove ssh ${bindir}/dropbearmulti
+ update-alternatives --remove scp ${bindir}/dropbearmulti
}
============================================================
--- packages/dropbear/dropbear_0.50.bb 61b1e18c0d8254b164c4d1ed3bf6b6b20d9fc200
+++ packages/dropbear/dropbear_0.51.bb b4549d3c7ecf3920758e70e164410850ae6bebe8
@@ -1,6 +1,5 @@ require dropbear.inc
require dropbear.inc
+PR = "r0"
-PR = "r1"
-
# testing
DEFAULT_PREFERENCE = "-1"
More information about the Openembedded-commits
mailing list