Difference between revisions of "MetaWebosCommits"

From WebOS-Ports
Jump to navigation Jump to search
Line 12: Line 12:
 
'''sent-upstream'''
 
'''sent-upstream'''
 
<poem>
 
<poem>
https://github.com/openwebos/meta-webos/pull/23
 
pick ffc67b2 webos-image: add missing pieces to support to support selecting an alternative to dropbear
 
pick ea692db webos-image: pull dropbear through ssh-server-dropbear image feature
 
pick e651094 task-webos-extended: remove dropbear
 
 
 
https://github.com/openwebos/meta-webos/pull/45
 
https://github.com/openwebos/meta-webos/pull/45
pick cf40d71 luna-sysmgr: install platform-specific icon layout config
+
pick 46c16d8 luna-sysmgr: install platform-specific icon layout config
  
https://github.com/openwebos/meta-webos/pull/48
+
https://github.com/openwebos/meta-webos/pull/51
pick 1bac9b1 browserserver: add patch to fix build for 64bit target
+
pick cbaf5de pmcertificatemgr: install openssl configuration file
 +
pick b407ce8 openssl: add override to install c_rehash utility
 +
pick 2437922 ca-certificates: populate runtime configuration for pmcertificatemgr
 +
pick 13c0ead pmcertificatemgr, openssl: Use u-a for openssl.cnf
  
pick 65ec447 webos: add P_V for webos-connman-adapter
+
pick bc9f4c9 webos-image: browserserver=0.7.2
pick 79c6df3 dropbear: Change from init.d to upstart
 
 
</poem>
 
</poem>
'''newer-layers'''
 
<poem>
 
https://github.com/openwebos/meta-webos/pull/46
 
pick 4daf0b8 task-webos-extended: add RPROVIDES/RREPLACES/RCONFLICTS to replace task-webos-core
 
pick d079746 task*: rename to packagegroup to match oe-core
 
pick dd791e6 packagegroup: add RPROVIDES/RREPLACES/RCONFLICTS for upgrade path from task-* recipes
 
pick faa075e packagegroup: inherit packagegroup and drop PACKAGES and ALLOW_EMPTY settings
 
pick 5b5ef54 webos*conf: use packagegroup-* names instead of task-*
 
pick 687acb6 webos-image.bbclass: use packagegroup-* names instead of task-*
 
  
https://github.com/openwebos/meta-webos/pull/44
 
pick a1a8f1c bbclasses, recipes: use 4 spaces in python tasks
 
pick 7e8f4fb nodejs: inherit from pythonnative to compile
 
pick f577b0a dhcp: rename bbappend to match new version from oe-core and use PRINC
 
pick bf895b9 busybox: rename bbappend to match new version from oe-core and use PRINC and update defconfig
 
pick 776eb25 webos.conf: drop P_V_linux-yocto: use default 3.4 now
 
pick 1ed9fe4 iproute2: rename as we have a newer version in meta-oe
 
pick 553dcb9 luna-sysmgr: use 4 spaces instead of tabs in python tasks
 
pick 87559c3 libtinyxml: drop, now in meta-oe
 
</poem>
 
 
'''rejected-upstream'''
 
'''rejected-upstream'''
 
<poem>
 
<poem>
 
https://github.com/openwebos/meta-webos/pull/19
 
https://github.com/openwebos/meta-webos/pull/19
pick 156a815 webkit: completely drop all machine-specific things
+
pick bb09142 webkit: completely drop all machine-specific things
 
https://github.com/openwebos/meta-webos/pull/40
 
https://github.com/openwebos/meta-webos/pull/40
pick b1f9b0c webos: define DEPLOY_DIR_IMAGE path with separate directory for each MACHINE
+
pick cf28122 webos: define DEPLOY_DIR_IMAGE path with separate directory for each MACHINE
 
https://github.com/openwebos/meta-webos/pull/41
 
https://github.com/openwebos/meta-webos/pull/41
pick 2262512 webkit-webos: drop wrong test for gold
+
pick d08f56f webkit-webos: drop wrong test for gold
 
</poem>
 
</poem>
 
'''webos-ports specific'''
 
'''webos-ports specific'''
 
<poem>
 
<poem>
pick 0149a2e orc: introduce changes related to orc from HP/Palm's meta-oe
+
pick e3d5655 orc: introduce changes related to orc from HP/Palm's meta-oe
pick abb2717 distro: webos: change PREFERRED_PROVIDER_jpeg to libjpeg-turbo
+
pick 20a49cc distro: webos: change PREFERRED_PROVIDER_jpeg to libjpeg-turbo
pick b170498 webos-image: add debug-tweaks to zap root password
+
pick 4d3e6fa webos-image: add debug-tweaks to prevent zap_root_password
pick e359b4e nyx-modules: add udev to DEPENDS
+
pick e6fd360 nyx-modules: add udev to DEPENDS
pick 4616fff nodejs: provide native version
+
pick 6784d35 nodejs: provide native version
pick 1914768 webos-preferred-versions: add versions for webappmanager and luna-sysmgr-common
+
 
pick 98ba2c1 webappmanager: add dependency on luna-sysmgr-common library
+
pick 8cd5b97 qt4-webos: add fontconfig, libxext and icu to DEPENDS
pick 6499046 webappmanager: add dependency on serviceinstaller and bump PR
+
pick 234e645 dropbear: set DISTRO_TYPE to debug
 +
pick 26ab2a0 webos-preferred-versions: org.webosinternals.service.update = 0.1.0-1
 +
pick e335c64 pulseaudio: Add bbappend to disable gtk/x11
 +
pick 7d0cab9 qt4-webos: drop libxext dependency
 +
pick 240c880 webos.conf: add LICENSE_CREATE_PACKAGE for webOS-ports
 
</poem>
 
</poem>
  
 
'''''Changes above webOS-ports/master:'''''
 
'''''Changes above webOS-ports/master:'''''
 +
 +
'''jansa/master'''
 +
pick ed4bd11 webos-image.bbclass: inherit core-image and remove boot_dd_append work around
 +
pick b3ae832 webos.conf: Remove argp and x11 from default DISTRO_FEATURES
  
 
'''switch from qmake-webos-native to qt4-native'''
 
'''switch from qmake-webos-native to qt4-native'''
 
https://github.com/webOS-ports/meta-webos/commits/jansa/qt4-native
 
https://github.com/webOS-ports/meta-webos/commits/jansa/qt4-native
 
<poem>
 
<poem>
pick 9401b44 webos-preferred-versions: add preferred versions for qt4-native
+
pick 960fe37 webos-preferred-versions: add preferred versions for qt4-native
pick 6d594a8 qt4-native: add bbappend to provide tools with -palm suffix
+
pick 33c232f qt4-native: add bbappend to provide tools with -palm suffix
pick e86ade9 qmake-webos-native: replace broken recipe in meta-webos with qt4-native
+
pick 7ff1e2c qmake-webos-native: replace broken recipe in meta-webos with qt4-native
pick a54b90b qmake-webos-native: drop
+
pick a5c7e86 qmake-webos-native: drop
 
</poem>
 
</poem>
  
Line 81: Line 67:
 
https://github.com/webOS-ports/meta-webos/commits/jansa/qt4-native-wip
 
https://github.com/webOS-ports/meta-webos/commits/jansa/qt4-native-wip
 
<poem>
 
<poem>
pick e59bb14 webkit-webos: pass spec to qmake and inherit qmake2
+
pick 462f917 webkit-webos: pass spec to qmake and inherit qmake2
 
</poem>
 
</poem>
  
Line 87: Line 73:
 
https://github.com/webOS-ports/meta-webos/commits/jansa/qt4-embedded
 
https://github.com/webOS-ports/meta-webos/commits/jansa/qt4-embedded
 
<poem>
 
<poem>
pick 5a6bca0 webos-preferred-versions: add preferred versions for qt4-embedded
+
pick 17a9ea7 webos-preferred-versions: add preferred versions for qt4-embedded
pick 495a83d packagegroup-webos-extended: don't rdepend on qt4-webos directly
+
pick 33563db qt4-embedded: use our own repo with all fixes included
pick 4a06596 qt4-embedded: use our own repo with all fixes included
+
pick 7f83578 qt4-embedded: add flags from qconfig-palm.h
pick 6b7c6b1 qt4-embedded: add flags from qconfig-palm.h
+
pick 8f4c61b qt4-embedded: disable QT_KEYPAD_NAVIGATION
pick 26b9c79 qt4-embedded: disable QT_KEYPAD_NAVIGATION
+
pick fe1d8cb qt4-embedded: disable tools, examples and demos
pick cc55aff qt4-embedded: disable tools, examples and demos
+
pick 9659bcf qt4-webos: drop
pick a8c66e1 qt4-webos: drop
 
 
</poem>
 
</poem>

Revision as of 14:32, 22 January 2013

Branches in webos-ports for of meta-webos:

 every branch is rebased on the one above
 master - upstream revision we're using as base
 webOS-ports/sent-upstream - commits sent in some pull-request waiting to be applied
 webOS-ports/newer-layers - commits needed for newer layers (oe-core, meta-oe)
 webOS-ports/rejected-upstream - commits sent in some pull-request before, which got rejected, but are still valid for us
 webOS-ports/specific - commits specific for webos-ports or waiting to be sent in some pull-request
 webOS-ports/master-next - resulting branch containing all above
 webOS-ports/master - used in webOS-ports builds, usually the same as webOS-ports/master-next, but can be different when newer webOS-ports/master-next is being tested

Changes in webOS-ports/master: sent-upstream <poem> https://github.com/openwebos/meta-webos/pull/45 pick 46c16d8 luna-sysmgr: install platform-specific icon layout config

https://github.com/openwebos/meta-webos/pull/51 pick cbaf5de pmcertificatemgr: install openssl configuration file pick b407ce8 openssl: add override to install c_rehash utility pick 2437922 ca-certificates: populate runtime configuration for pmcertificatemgr pick 13c0ead pmcertificatemgr, openssl: Use u-a for openssl.cnf

pick bc9f4c9 webos-image: browserserver=0.7.2 </poem>

rejected-upstream <poem> https://github.com/openwebos/meta-webos/pull/19 pick bb09142 webkit: completely drop all machine-specific things https://github.com/openwebos/meta-webos/pull/40 pick cf28122 webos: define DEPLOY_DIR_IMAGE path with separate directory for each MACHINE https://github.com/openwebos/meta-webos/pull/41 pick d08f56f webkit-webos: drop wrong test for gold </poem> webos-ports specific <poem> pick e3d5655 orc: introduce changes related to orc from HP/Palm's meta-oe pick 20a49cc distro: webos: change PREFERRED_PROVIDER_jpeg to libjpeg-turbo pick 4d3e6fa webos-image: add debug-tweaks to prevent zap_root_password pick e6fd360 nyx-modules: add udev to DEPENDS pick 6784d35 nodejs: provide native version

pick 8cd5b97 qt4-webos: add fontconfig, libxext and icu to DEPENDS pick 234e645 dropbear: set DISTRO_TYPE to debug pick 26ab2a0 webos-preferred-versions: org.webosinternals.service.update = 0.1.0-1 pick e335c64 pulseaudio: Add bbappend to disable gtk/x11 pick 7d0cab9 qt4-webos: drop libxext dependency pick 240c880 webos.conf: add LICENSE_CREATE_PACKAGE for webOS-ports </poem>

Changes above webOS-ports/master:

jansa/master pick ed4bd11 webos-image.bbclass: inherit core-image and remove boot_dd_append work around pick b3ae832 webos.conf: Remove argp and x11 from default DISTRO_FEATURES

switch from qmake-webos-native to qt4-native https://github.com/webOS-ports/meta-webos/commits/jansa/qt4-native <poem> pick 960fe37 webos-preferred-versions: add preferred versions for qt4-native pick 33c232f qt4-native: add bbappend to provide tools with -palm suffix pick 7ff1e2c qmake-webos-native: replace broken recipe in meta-webos with qt4-native pick a5c7e86 qmake-webos-native: drop </poem>

wip fixes for qt4-native https://github.com/webOS-ports/meta-webos/commits/jansa/qt4-native-wip <poem> pick 462f917 webkit-webos: pass spec to qmake and inherit qmake2 </poem>

switch from qt4-webos to qt4-embedded bbappend https://github.com/webOS-ports/meta-webos/commits/jansa/qt4-embedded <poem> pick 17a9ea7 webos-preferred-versions: add preferred versions for qt4-embedded pick 33563db qt4-embedded: use our own repo with all fixes included pick 7f83578 qt4-embedded: add flags from qconfig-palm.h pick 8f4c61b qt4-embedded: disable QT_KEYPAD_NAVIGATION pick fe1d8cb qt4-embedded: disable tools, examples and demos pick 9659bcf qt4-webos: drop </poem>