diff --git a/recipes-graphics/wayland/weston-init/weston.ini b/recipes-graphics/wayland/weston-init/weston.ini index f17bc2b..ed06404 100644 --- a/recipes-graphics/wayland/weston-init/weston.ini +++ b/recipes-graphics/wayland/weston-init/weston.ini @@ -97,5 +97,6 @@ calibration_helper=/bin/echo [screen-share] command=/usr/bin/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize + #[xwayland] #path=/usr/bin/Xwayland diff --git a/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bbappend b/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bbappend deleted file mode 100644 index 2b9fb0c..0000000 --- a/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -# make-mode-scripts package -dev and -dbg are empty so don't generate them -ALLOW_EMPTY_${PN}-dev = "0" -ALLOW_EMPTY_${PN}-dbg = "0" diff --git a/scripts/lib/wic/plugins/source/gptcopy.py b/scripts/lib/wic/plugins/source/gptcopy.py deleted file mode 100644 index 259cd43..0000000 --- a/scripts/lib/wic/plugins/source/gptcopy.py +++ /dev/null @@ -1,71 +0,0 @@ -# ex:ts=4:sw=4:sts=4:et -# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# -# This python script are copied/modified from rawcopy -# (https://github.com/openembedded/openembedded-core/blob/master/scripts/lib/wic/plugins/source/rawcopy.py) -# -import logging -import os - -from wic import WicError -from wic.pluginbase import SourcePlugin -from wic.misc import exec_cmd, get_bitbake_var -from wic.filemap import sparse_copy - -logger = logging.getLogger('wic') - -class GptCopyPlugin(SourcePlugin): - """ - Populate partition content from raw image file. - """ - - name = 'gptcopy' - - @classmethod - def do_prepare_partition(cls, part, source_params, cr, cr_workdir, - oe_builddir, bootimg_dir, kernel_dir, - rootfs_dir, native_sysroot): - """ - Called to do the actual content population for a partition i.e. it - 'prepares' the partition to be incorporated into the image. - """ - if not kernel_dir: - kernel_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") - if not kernel_dir: - raise WicError("Couldn't find DEPLOY_DIR_IMAGE, exiting") - - logger.debug('Kernel dir: %s', kernel_dir) - - if 'file' not in source_params: - raise WicError("No file specified") - - src = os.path.join(kernel_dir, source_params['file']) - dst = os.path.join(cr_workdir, "%s.%s" % (source_params['file'], part.lineno)) - - if 'skip' in source_params: - sparse_copy(src, dst, skip=int(source_params['skip'])) - else: - sparse_copy(src, dst) - - # get the size in the right units for kickstart (kB) - du_cmd = "du -Lbks %s" % dst - out = exec_cmd(du_cmd) - filesize = int(out.split()[0]) - - if filesize > part.size: - part.size = filesize - - part.source_file = dst