Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- $ git pull yocto master
- remote: Counting objects: 90, done.
- remote: Compressing objects: 100% (43/43), done.
- remote: Total 67 (delta 44), reused 47 (delta 24)
- Unpacking objects: 100% (67/67), done.
- From git://git.yoctoproject.org/poky
- * branch master -> FETCH_HEAD
- Auto-merging meta/recipes-support/sqlite/sqlite3_3.8.3.1.bb
- Auto-merging meta/lib/oe/package_manager.py
- Merge made by the 'recursive' strategy.
- meta/conf/distro/include/security_flags.inc | 12 ++++++++++++
- meta/lib/oe/package_manager.py | 24 +++++++++++++++---------
- meta/lib/oeqa/targetcontrol.py | 2 +-
- meta/recipes-bsp/grub/grub/autogen.sh-exclude-pc.patch | 34 ++++++++++++++++++++++++++++++++++
- meta/recipes-bsp/grub/grub_git.bb | 1 +
- meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- meta/recipes-devtools/dpkg/dpkg/no-vla-warning.patch | 32 ++++++++++++++++++++++++++++++++
- meta/recipes-devtools/dpkg/dpkg_1.17.4.bb | 2 ++
- meta/recipes-support/sqlite/{sqlite3_3080301.bb => sqlite3_3.8.3.1.bb} | 10 ++++++++--
- scripts/runqemu | 2 +-
- 10 files changed, 192 insertions(+), 13 deletions(-)
- create mode 100644 meta/recipes-bsp/grub/grub/autogen.sh-exclude-pc.patch
- create mode 100644 meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch
- create mode 100644 meta/recipes-devtools/dpkg/dpkg/no-vla-warning.patch
- 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