diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-08-23 12:15:02 +0100 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-08-23 12:15:02 +0100 |
| commit | 064ef39c2964d51dfc44eb4e38c988744830a6d4 (patch) | |
| tree | 3416e62ecdf6a87e1c11b2342034f42955893676 /recipes | |
| parent | 1161ce2449d28dabb72dc7d9cb89dd05d101a313 (diff) | |
| parent | 8043677ecf08eca924fdd18822712ccad229a438 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/net-snmp/net-snmp.inc | 4 | ||||
| -rw-r--r-- | recipes/u-boot/u-boot_git.bb | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/recipes/net-snmp/net-snmp.inc b/recipes/net-snmp/net-snmp.inc index bbe809696e..dcc02e7f67 100644 --- a/recipes/net-snmp/net-snmp.inc +++ b/recipes/net-snmp/net-snmp.inc @@ -48,8 +48,8 @@ do_stage() { fi install -d ${STAGING_DIR_HOST}${layout_bindir} sed -e "s@-I/usr/include@@g" \ - -e "s@^prefix=.*@prefix=${STAING_DIR_HOST}@g" \ - -e "s@^exec_prefix=.*@exec_prefix=${STAING_DIR_HOST}@g" \ + -e "s@^prefix=.*@prefix=${STAGING_DIR_HOST}@g" \ + -e "s@^exec_prefix=.*@exec_prefix=${STAGING_DIR_HOST}@g" \ -e "s@^includedir=.*@includedir=${STAGING_INCDIR}@g" \ -e "s@^libdir=.*@libdir=${STAGING_LIBDIR}@g" \ -i net-snmp-config diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb index 202409287b..d30b0bdbd0 100644 --- a/recipes/u-boot/u-boot_git.bb +++ b/recipes/u-boot/u-boot_git.bb @@ -67,7 +67,6 @@ SRCREV_neuros-osd2 = "8de979d346624c0e4cfe2e5c0f08ce20ca4b5d14" SRC_URI_sequoia = "git://www.denx.de/git/u-boot.git;protocol=git" SRCREV_sequoa = "cf3b41e0c1111dbb865b6e34e9f3c3d3145a6093" -SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git " SRC_URI_sequoia = "git://www.denx.de/git/u-boot.git;protocol=git;tag=cf3b41e0c1111dbb865b6e34e9f3c3d3145a6093 " SRC_URI_mini2440 = "git://repo.or.cz/u-boot-openmoko/mini2440.git;protocol=git;branch=dev-mini2440-stable" |