diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-oe/recipes-support/synergy | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/synergy')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/synergy/synergy_git.bb | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/synergy/synergy_git.bb b/meta-openembedded/meta-oe/recipes-support/synergy/synergy_git.bb index 68f0387ba9..f5518bd8c1 100644 --- a/meta-openembedded/meta-oe/recipes-support/synergy/synergy_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/synergy/synergy_git.bb @@ -1,35 +1,24 @@ SUMMARY = "Synergy - control multiple computers with one keyboard and mouse" HOMEPAGE = "http://synergy-project.org" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d2ba51ca68e055566aade24662f9eb41" +LIC_FILES_CHKSUM = "file://LICENSE;md5=54c1fc8d8bb6776ae501acfb1585e9d6" LICENSE = "GPL-2.0-with-OpenSSL-exception" SECTION = "x11/utils" DEPENDS = "virtual/libx11 libxtst libxinerama curl openssl" -do_unpack_extra[depends] = "unzip-native:do_populate_sysroot" # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "git://github.com/symless/synergy.git;protocol=http" +SRC_URI = "git://github.com/symless/synergy-core;protocol=https;nobranch=1" -# Version 1.8.8-stable -SRCREV ?= "c30301e23424db1125664da17deb8c3aa6aec52d" -PV = "1.8.8+${SRCPV}" +# Version 1.10.1-stable +SRCREV ?= "1b4c076127687aceac931d269e898beaac1cad9f" +PV = "1.10.1+git${SRCPV}" S = "${WORKDIR}/git" inherit cmake distro_features_check -do_unpack_extra() { - cd ${S}/ext - for file in *.zip; do - fname="${file##*/}" - unzip $file -d ${fname%.*} - done -} -addtask unpack_extra after do_unpack before do_patch - -do_install() { - install -d ${D}/usr/bin - install -m 0755 ${S}/bin/synergy* ${D}/usr/bin/ -} +EXTRA_OECMAKE += "-DSYNERGY_BUILD_LEGACY_GUI=OFF" + +FILES_${PN} += "${datadir}/icons/hicolor" |