Advertisement
Guest User

Untitled

a guest
Feb 27th, 2014
56
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.76 KB | None | 0 0
  1. $ git pull yocto master
  2. remote: Counting objects: 90, done.
  3. remote: Compressing objects: 100% (43/43), done.
  4. remote: Total 67 (delta 44), reused 47 (delta 24)
  5. Unpacking objects: 100% (67/67), done.
  6. From git://git.yoctoproject.org/poky
  7. * branch master -> FETCH_HEAD
  8. Auto-merging meta/recipes-support/sqlite/sqlite3_3.8.3.1.bb
  9. Auto-merging meta/lib/oe/package_manager.py
  10. Merge made by the 'recursive' strategy.
  11. meta/conf/distro/include/security_flags.inc | 12 ++++++++++++
  12. meta/lib/oe/package_manager.py | 24 +++++++++++++++---------
  13. meta/lib/oeqa/targetcontrol.py | 2 +-
  14. meta/recipes-bsp/grub/grub/autogen.sh-exclude-pc.patch | 34 ++++++++++++++++++++++++++++++++++
  15. meta/recipes-bsp/grub/grub_git.bb | 1 +
  16. meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  17. meta/recipes-devtools/dpkg/dpkg/no-vla-warning.patch | 32 ++++++++++++++++++++++++++++++++
  18. meta/recipes-devtools/dpkg/dpkg_1.17.4.bb | 2 ++
  19. meta/recipes-support/sqlite/{sqlite3_3080301.bb => sqlite3_3.8.3.1.bb} | 10 ++++++++--
  20. scripts/runqemu | 2 +-
  21. 10 files changed, 192 insertions(+), 13 deletions(-)
  22. create mode 100644 meta/recipes-bsp/grub/grub/autogen.sh-exclude-pc.patch
  23. create mode 100644 meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch
  24. create mode 100644 meta/recipes-devtools/dpkg/dpkg/no-vla-warning.patch
  25. rename meta/recipes-support/sqlite/{sqlite3_3080301.bb => sqlite3_3.8.3.1.bb} (53%)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement