Remove unused recipes.
None of these recipes are used anymore either because a newer version exists in poky or because they are no longer needed in citadel.
This commit is contained in:
parent
aed005c945
commit
6420cded5d
@ -1,20 +0,0 @@
|
||||
SUMMARY = "An adaptive Gtk+ theme based on Material Design Guidelines"
|
||||
HOMEPAGE = "https://github.com/adapta-project"
|
||||
|
||||
LICENSE = "GPLv2 & CC-BY-SA-4.0"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
file://LICENSE_CC_BY_SA4;md5=e277f2eefa979e093628e4fb368f5044"
|
||||
|
||||
SRC_URI = "git://github.com/adapta-project/adapta-gtk-theme.git;protocol=https"
|
||||
SRCREV = "589d00cba24b2076f41f4022140ff442556eb9ca"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
DEPENDS = "gdk-pixbuf glib-2.0 glib-2.0-native sassc-native"
|
||||
|
||||
inherit pkgconfig autotools-brokensep allarch
|
||||
|
||||
FILES_${PN} = "${datadir}/themes"
|
||||
|
||||
EXTRA_OECONF = "--disable-cinnamon --disable-flashback --disable-xfce --disable-mate --disable-openbox --disable-plank --disable-telegram --disable-chrome-legacy --disable-gtk_next --disable-parallel"
|
||||
|
||||
@ -7,15 +7,12 @@ SRC_URI += "\
|
||||
file://50_gnome-terminal.gschema.override \
|
||||
"
|
||||
|
||||
DEPENDS += "paxctl-native"
|
||||
|
||||
do_install_append() {
|
||||
install -m 644 ${WORKDIR}/50_gnome-terminal.gschema.override ${D}${datadir}/glib-2.0/schemas
|
||||
install -m 644 ${WORKDIR}/org.gnome.TerminalCitadel.desktop ${D}${datadir}/applications
|
||||
install -m 644 ${WORKDIR}/org.gnome.TerminalCitadel.service ${D}${datadir}/dbus-1/services
|
||||
install -m 644 ${WORKDIR}/gnome-terminal-citadel.service ${D}${systemd_user_unitdir}
|
||||
rm ${D}${datadir}/applications/org.gnome.Terminal.desktop
|
||||
paxctl -cm ${D}${libexecdir}/gnome-terminal-server
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
DESCRIPTION = "Linux user-space application to modify the EFI Boot Manager."
|
||||
SUMMARY = "EFI Boot Manager"
|
||||
HOMEPAGE = "https://github.com/rhinstaller/efibootmgr"
|
||||
SECTION = "base"
|
||||
|
||||
LICENSE = "GPLv2+"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
|
||||
|
||||
DEPENDS = "pciutils zlib efivar popt"
|
||||
|
||||
COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
|
||||
|
||||
SRCREV = "e067160ecef8208e1944002e5d50b275733211fb"
|
||||
SRC_URI = "git://github.com/rhinstaller/efibootmgr.git;protocol=https \
|
||||
file://0001-remove-extra-decl.patch \
|
||||
"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit pkgconfig
|
||||
|
||||
EXTRA_OEMAKE = "'EFIDIR=/' 'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/src/include `pkg-config --cflags efivar`'"
|
||||
|
||||
CFLAGS_append_toolchain-clang = " -Wno-error"
|
||||
do_install () {
|
||||
install -D -p -m0755 ${B}/src/efibootmgr ${D}/${sbindir}/efibootmgr
|
||||
}
|
||||
|
||||
CLEANBROKEN = "1"
|
||||
@ -1,31 +0,0 @@
|
||||
From 99b578501643377e0b1994b2a068b790d189d5ad Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Wed, 13 Jun 2018 09:41:01 -0400
|
||||
Subject: [PATCH] remove extra decl
|
||||
|
||||
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||
|
||||
Upstream-Status: Backport [git://github.com/rhinstaller/efibootmgr.git]
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
|
||||
---
|
||||
src/efibootmgr.c | 3 ---
|
||||
1 file changed, 3 deletions(-)
|
||||
|
||||
diff --git a/src/efibootmgr.c b/src/efibootmgr.c
|
||||
index de38f01..4e1a680 100644
|
||||
--- a/src/efibootmgr.c
|
||||
+++ b/src/efibootmgr.c
|
||||
@@ -1536,9 +1536,6 @@ parse_opts(int argc, char **argv)
|
||||
"invalid numeric value %s\n",
|
||||
optarg);
|
||||
}
|
||||
- /* XXX efivar-36 accidentally doesn't have a public
|
||||
- * header for this */
|
||||
- extern int efi_set_verbose(int verbosity, FILE *errlog);
|
||||
efi_set_verbose(opts.verbose - 2, stderr);
|
||||
break;
|
||||
case 'V':
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
Don't use -Werror because newer compilers introduce newer warnings.
|
||||
|
||||
Upstream-Status: Inappropriate [https://github.com/rhboot/efivar/issues/131]
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
|
||||
diff --git a/gcc.specs b/gcc.specs
|
||||
index 45d43d1..1baf11a 100644
|
||||
--- a/gcc.specs
|
||||
+++ b/gcc.specs
|
||||
@@ -2,7 +2,7 @@
|
||||
+ -D_GNU_SOURCE
|
||||
|
||||
*efivar_cpp_options:
|
||||
- -Werror -Wall -std=gnu11 -Wextra
|
||||
+ -Wall -std=gnu11 -Wextra
|
||||
|
||||
*cpp_options:
|
||||
+ %(efivar_cpp_options)
|
||||
@ -1,40 +0,0 @@
|
||||
SUMMARY = "Tools to manipulate UEFI variables"
|
||||
DESCRIPTION = "efivar provides a simple command line interface to the UEFI variable facility"
|
||||
HOMEPAGE = "https://github.com/rhboot/efivar"
|
||||
|
||||
LICENSE = "LGPLv2.1+"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=6626bb1e20189cfa95f2c508ba286393"
|
||||
|
||||
COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
|
||||
|
||||
SRC_URI = "git://github.com/rhinstaller/efivar.git \
|
||||
file://no-werror.patch"
|
||||
SRCREV = "c1d6b10e1ed4ba2be07f385eae5bceb694478a10"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit pkgconfig
|
||||
|
||||
export CCLD_FOR_BUILD = "${BUILD_CCLD}"
|
||||
|
||||
# Upstream uses --add-needed in gcc.specs which gold doesn't support, so
|
||||
# enforce BFD.
|
||||
LDFLAGS += "-fuse-ld=bfd"
|
||||
|
||||
do_compile_prepend() {
|
||||
# Remove when https://github.com/rhboot/efivar/issues/130 is fixed
|
||||
oe_runmake \
|
||||
CFLAGS="${BUILD_CFLAGS}" \
|
||||
LDFLAGS="${BUILD_LDFLAGS}" \
|
||||
-C src makeguids
|
||||
}
|
||||
|
||||
do_install() {
|
||||
oe_runmake install DESTDIR=${D}
|
||||
}
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
|
||||
RRECOMMENDS_${PN}_class-target = "kernel-module-efivarfs"
|
||||
|
||||
CLEANBROKEN = "1"
|
||||
@ -1,42 +0,0 @@
|
||||
Subject: [PATCH] iw: version.sh: don't use git describe for versioning
|
||||
|
||||
It will detect top-level git repositories like the Angstrom setup-scripts and break.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
Signed-off-by: Maxin B. John <maxin.john@intel.com>
|
||||
---
|
||||
diff -Naur iw-4.7-orig/version.sh iw-4.7/version.sh
|
||||
--- iw-4.7-orig/version.sh 2016-05-31 12:52:46.000000000 +0300
|
||||
+++ iw-4.7/version.sh 2016-06-01 11:21:58.307409060 +0300
|
||||
@@ -15,27 +15,7 @@
|
||||
SRC_DIR=$(cd ${SRC_DIR}; pwd)
|
||||
cd "${SRC_DIR}"
|
||||
|
||||
-v=""
|
||||
-if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then
|
||||
- git update-index --refresh --unmerged > /dev/null
|
||||
- descr=$(git describe --match=v* 2>/dev/null)
|
||||
- if [ $? -eq 0 ]; then
|
||||
- # on git builds check that the version number above
|
||||
- # is correct...
|
||||
- if [ "${descr%%-*}" = "v$VERSION" ]; then
|
||||
- v="${descr#v}"
|
||||
- if git diff-index --name-only HEAD | read dummy ; then
|
||||
- v="$v"-dirty
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
-fi
|
||||
-
|
||||
-# set to the default version when failed to get the version
|
||||
-# information with git
|
||||
-if [ -z "${v}" ]; then
|
||||
- v="$VERSION"
|
||||
-fi
|
||||
+v="$VERSION"
|
||||
|
||||
echo '#include "iw.h"' > "$OUT"
|
||||
echo "const char iw_version[] = \"$v\";" >> "$OUT"
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
Subject: [PATCH] Support separation of SRCDIR and OBJDIR
|
||||
|
||||
Typical use of VPATH to locate the sources.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
|
||||
Signed-off-by: Maxin B. John <maxin.john@intel.com>
|
||||
---
|
||||
diff -Naur iw-4.3-origin/Makefile iw-4.3/Makefile
|
||||
--- iw-4.3-origin/Makefile 2015-11-20 16:37:58.752077287 +0200
|
||||
+++ iw-4.3/Makefile 2015-11-20 16:57:15.510615815 +0200
|
||||
@@ -1,5 +1,7 @@
|
||||
MAKEFLAGS += --no-print-directory
|
||||
-
|
||||
+SRCDIR ?= $(dir $(lastword $(MAKEFILE_LIST)))
|
||||
+OBJDIR ?= $(PWD)
|
||||
+VPATH = $(SRCDIR)
|
||||
PREFIX ?= /usr
|
||||
SBINDIR ?= $(PREFIX)/sbin
|
||||
MANDIR ?= $(PREFIX)/share/man
|
||||
@@ -95,11 +97,11 @@
|
||||
version.c: version.sh $(patsubst %.o,%.c,$(VERSION_OBJS)) nl80211.h iw.h Makefile \
|
||||
$(wildcard .git/index .git/refs/tags)
|
||||
@$(NQ) ' GEN ' $@
|
||||
- $(Q)./version.sh $@
|
||||
+ $(Q)cd $(SRCDIR) && ./version.sh $(OBJDIR)/$@
|
||||
|
||||
%.o: %.c iw.h nl80211.h
|
||||
@$(NQ) ' CC ' $@
|
||||
- $(Q)$(CC) $(CFLAGS) -c -o $@ $<
|
||||
+ $(Q)$(CC) -I$(SRCDIR) $(CFLAGS) -c -o $@ $<
|
||||
|
||||
ifeq ($(IW_ANDROID_BUILD),)
|
||||
iw: $(OBJS)
|
||||
@ -1,34 +0,0 @@
|
||||
SUMMARY = "nl80211 based CLI configuration utility for wireless devices"
|
||||
DESCRIPTION = "iw is a new nl80211 based CLI configuration utility for \
|
||||
wireless devices. It supports almost all new drivers that have been added \
|
||||
to the kernel recently. "
|
||||
HOMEPAGE = "http://wireless.kernel.org/en/users/Documentation/iw"
|
||||
SECTION = "base"
|
||||
LICENSE = "BSD"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=878618a5c4af25e9b93ef0be1a93f774"
|
||||
|
||||
DEPENDS = "libnl"
|
||||
|
||||
SRC_URI = "http://www.kernel.org/pub/software/network/iw/${BP}.tar.gz \
|
||||
file://0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch \
|
||||
file://separate-objdir.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "2067516ca9940fdb8c091ee3250da374"
|
||||
SRC_URI[sha256sum] = "a0c3aad6ff52234d03a2522ba2eba570e36abb3e60dc29bf0b1ce88dd725d6d4"
|
||||
|
||||
inherit pkgconfig
|
||||
|
||||
EXTRA_OEMAKE = "\
|
||||
-f '${S}/Makefile' \
|
||||
\
|
||||
'PREFIX=${prefix}' \
|
||||
'SBINDIR=${sbindir}' \
|
||||
'MANDIR=${mandir}' \
|
||||
"
|
||||
B = "${WORKDIR}/build"
|
||||
|
||||
do_install() {
|
||||
oe_runmake 'DESTDIR=${D}' install
|
||||
}
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
SUMMARY = "Internationalized Domain Name support library"
|
||||
DESCRIPTION = "Implementation of the Stringprep, Punycode and IDNA specifications defined by the IETF Internationalized Domain Names (IDN) working group."
|
||||
HOMEPAGE = "http://www.gnu.org/software/libidn/"
|
||||
SECTION = "libs"
|
||||
LICENSE = "(GPLv2+ | LGPLv3) & GPLv3+"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=ab90e75ef97cc6318ce4f2fbda62fe4d \
|
||||
file://COPYING.LESSERv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
|
||||
file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
file://src/idn2.c;endline=16;md5=0283aec28e049f5bcaaeee52aa865874 \
|
||||
file://lib/idn2.h.in;endline=27;md5=c2cd28d3f87260f157f022eabb83714f"
|
||||
|
||||
SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz"
|
||||
|
||||
SRC_URI[md5sum] = "eaf9a5b9d03b0cce3760f34b3124eb36"
|
||||
SRC_URI[sha256sum] = "53f69170886f1fa6fa5b332439c7a77a7d22626a82ef17e2c1224858bb4ca2b8"
|
||||
|
||||
DEPENDS = "virtual/libiconv libunistring"
|
||||
|
||||
inherit pkgconfig autotools gettext texinfo gtk-doc lib_package
|
||||
|
||||
EXTRA_OECONF += "--disable-rpath \
|
||||
--with-libunistring-prefix=${STAGING_EXECPREFIXDIR} \
|
||||
"
|
||||
|
||||
LICENSE_${PN} = "(GPLv2+ | LGPLv3)"
|
||||
LICENSE_${PN}-bin = "GPLv3+"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
Subject: [PATCH] fix libnl-3.4.0 musl compile problem
|
||||
Avoid in6_addr redefinition
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
|
||||
---
|
||||
include/linux-private/linux/if_bridge.h | 1 -
|
||||
include/linux-private/linux/ipv6.h | 1 -
|
||||
2 files changed, 2 deletions(-)
|
||||
|
||||
diff --git a/include/linux-private/linux/if_bridge.h b/include/linux-private/linux/if_bridge.h
|
||||
index f24050b..8f7490c 100644
|
||||
--- a/include/linux-private/linux/if_bridge.h
|
||||
+++ b/include/linux-private/linux/if_bridge.h
|
||||
@@ -15,7 +15,6 @@
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <linux/if_ether.h>
|
||||
-#include <linux/in6.h>
|
||||
|
||||
#define SYSFS_BRIDGE_ATTR "bridge"
|
||||
#define SYSFS_BRIDGE_FDB "brforward"
|
||||
diff --git a/include/linux-private/linux/ipv6.h b/include/linux-private/linux/ipv6.h
|
||||
index e05e684..f16349d 100644
|
||||
--- a/include/linux-private/linux/ipv6.h
|
||||
+++ b/include/linux-private/linux/ipv6.h
|
||||
@@ -2,7 +2,6 @@
|
||||
#define _IPV6_H
|
||||
|
||||
#include <asm/byteorder.h>
|
||||
-#include <linux/in6.h>
|
||||
|
||||
/* The latest drafts declared increase in minimal mtu up to 1280. */
|
||||
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
Upstream-Status: Pending
|
||||
|
||||
Some packages are asking only for libnl-2.0, but expects to get also
|
||||
libnl-genl, libnl-nf libnl-route, easiest way to fix them is here.
|
||||
|
||||
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
|
||||
Index: libnl-3.2.14/libnl-3.0.pc.in
|
||||
===================================================================
|
||||
--- libnl-3.2.14.orig/libnl-3.0.pc.in
|
||||
+++ libnl-3.2.14/libnl-3.0.pc.in
|
||||
@@ -6,5 +6,5 @@ includedir=@includedir@
|
||||
Name: libnl
|
||||
Description: Convenience library for netlink sockets
|
||||
Version: @PACKAGE_VERSION@
|
||||
-Libs: -L${libdir} -lnl-@MAJ_VERSION@
|
||||
+Libs: -L${libdir} -lnl-@MAJ_VERSION@ -lnl-genl-@MAJ_VERSION@ -lnl-nf-@MAJ_VERSION@ -lnl-route-@MAJ_VERSION@
|
||||
Cflags: -I${includedir}/libnl@MAJ_VERSION@
|
||||
@ -1,46 +0,0 @@
|
||||
SUMMARY = "A library for applications dealing with netlink sockets"
|
||||
HOMEPAGE = "http://www.infradead.org/~tgr/libnl/"
|
||||
SECTION = "libs/network"
|
||||
|
||||
PE = "1"
|
||||
|
||||
LICENSE = "LGPLv2.1"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
|
||||
|
||||
DEPENDS = "flex-native bison-native"
|
||||
|
||||
SRC_URI = "https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz \
|
||||
file://fix-pc-file.patch \
|
||||
file://0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch \
|
||||
"
|
||||
|
||||
UPSTREAM_CHECK_URI = "https://github.com/thom311/${BPN}/releases"
|
||||
|
||||
SRC_URI[md5sum] = "8f71910c03db363b41e2ea62057a4311"
|
||||
SRC_URI[sha256sum] = "b7287637ae71c6db6f89e1422c995f0407ff2fe50cecd61a312b6a9b0921f5bf"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
FILES_${PN} = "${libdir}/libnl-3.so.* \
|
||||
${libdir}/libnl.so.* \
|
||||
${sysconfdir}"
|
||||
RREPLACES_${PN} = "libnl2"
|
||||
RCONFLICTS_${PN} = "libnl2"
|
||||
FILES_${PN}-dev += "${libdir}/libnl/cli/*/*.la"
|
||||
FILES_${PN}-staticdev += "${libdir}/libnl/cli/*/*.a"
|
||||
|
||||
PACKAGES += "${PN}-cli ${PN}-genl ${PN}-idiag ${PN}-nf ${PN}-route ${PN}-xfrm"
|
||||
FILES_${PN}-cli = "${libdir}/libnl-cli-3.so.* \
|
||||
${libdir}/libnl/cli/*/*.so \
|
||||
${bindir}/genl-ctrl-list \
|
||||
${bindir}/idiag-socket-details \
|
||||
${bindir}/nf-* \
|
||||
${bindir}/nl-*"
|
||||
FILES_${PN}-genl = "${libdir}/libnl-genl-3.so.* \
|
||||
${libdir}/libnl-genl.so.*"
|
||||
FILES_${PN}-idiag = "${libdir}/libnl-idiag-3.so.*"
|
||||
FILES_${PN}-nf = "${libdir}/libnl-nf-3.so.*"
|
||||
FILES_${PN}-route = "${libdir}/libnl-route-3.so.*"
|
||||
FILES_${PN}-xfrm = "${libdir}/libnl-xfrm-3.so.*"
|
||||
RREPLACES_${PN}-genl = "libnl-genl2"
|
||||
RCONFLICTS_${PN}-genl = "libnl-genl2"
|
||||
@ -1,39 +0,0 @@
|
||||
DESCRIPTION = "paxctl is a tool that allows PaX flags to be modified on a \
|
||||
per-binary basis. PaX is part of common security-enhancing \
|
||||
kernel patches and secure distributions, such as \
|
||||
GrSecurity or Adamantix and Hardened Gen-too, respectively."
|
||||
HOMEPAGE = "https://pax.grsecurity.net/"
|
||||
LICENSE = "GPLv2"
|
||||
LIC_FILES_CHKSUM = "file://paxctl.c;beginline=1;endline=5;md5=0ddd065c61020dda79729e6bedaed2c7 \
|
||||
file://paxctl-elf.c;beginline=1;endline=5;md5=99f453ce7f6d1687ee808982e2924813 \
|
||||
"
|
||||
|
||||
SRC_URI = "http://pax.grsecurity.net/${BP}.tar.gz"
|
||||
|
||||
SRC_URI[md5sum] = "9bea59b1987dc4e16c2d22d745374e64"
|
||||
SRC_URI[sha256sum] = "a330ddd812688169802a3ba29e5e3b19956376b8f6f73b8d7e9586eb04423c2e"
|
||||
|
||||
EXTRA_OEMAKE = "CC='${CC}' DESTDIR='${D}'"
|
||||
|
||||
do_install() {
|
||||
install -d ${D}${sbindir}
|
||||
install -m 755 paxctl ${D}${sbindir}/paxctl
|
||||
}
|
||||
|
||||
# The install target in the Makefile will fail for paxctl-native with error:
|
||||
# install -D --owner 0 --group 0 --mode a=rx paxctl .../sbin/paxctl
|
||||
# install: cannot change ownership of '.../sbin/paxctl': \
|
||||
# Operation not permitted
|
||||
# Drop '--owner 0 --group 0' to fix the issue.
|
||||
do_install_class-native() {
|
||||
local PROG=paxctl
|
||||
install -d ${D}${base_sbindir}
|
||||
install -d ${D}${mandir}/man1
|
||||
install --mode a=rx $PROG ${D}${base_sbindir}/$PROG
|
||||
install --mode a=r $PROG.1 ${D}${mandir}/man1/$PROG.1
|
||||
}
|
||||
|
||||
# Avoid QA Issue: No GNU_HASH in the elf binary
|
||||
INSANE_SKIP_${PN} = "ldflags"
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
@ -1,39 +0,0 @@
|
||||
From 5ed25c076a1fb1889a3c50dddf29f21850b59a13 Mon Sep 17 00:00:00 2001
|
||||
From: Wenzong Fan <wenzong.fan@windriver.com>
|
||||
Date: Tue, 26 Jun 2018 17:29:09 +0800
|
||||
Subject: [PATCH] disable acl header check
|
||||
|
||||
Don't check 'sys/acl.h' if acl support disabled for vim/vim-tiny.
|
||||
|
||||
Upstream-Status: pending
|
||||
|
||||
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
|
||||
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
||||
---
|
||||
src/configure.ac | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/configure.ac b/src/configure.ac
|
||||
index 107c170..0ee86ad 100644
|
||||
--- a/src/configure.ac
|
||||
+++ b/src/configure.ac
|
||||
@@ -3220,7 +3220,7 @@ AC_CHECK_HEADERS(stdint.h stdlib.h string.h \
|
||||
sys/systeminfo.h locale.h sys/stream.h termios.h \
|
||||
libc.h sys/statfs.h poll.h sys/poll.h pwd.h \
|
||||
utime.h sys/param.h libintl.h libgen.h \
|
||||
- util/debug.h util/msg18n.h frame.h sys/acl.h \
|
||||
+ util/debug.h util/msg18n.h frame.h \
|
||||
sys/access.h sys/sysinfo.h wchar.h wctype.h)
|
||||
|
||||
dnl sys/ptem.h depends on sys/stream.h on Solaris
|
||||
@@ -3848,6 +3848,7 @@ AC_ARG_ENABLE(acl,
|
||||
, [enable_acl="yes"])
|
||||
if test "$enable_acl" = "yes"; then
|
||||
AC_MSG_RESULT(no)
|
||||
+ AC_CHECK_HEADERS(sys/acl.h)
|
||||
AC_CHECK_LIB(posix1e, acl_get_file, [LIBS="$LIBS -lposix1e"],
|
||||
AC_CHECK_LIB(acl, acl_get_file, [LIBS="$LIBS -lacl"
|
||||
AC_CHECK_LIB(attr, fgetxattr, LIBS="$LIBS -lattr",,)],,),)
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
From 38de4bccdb8a861ffdd447f12fdab19d6d852c02 Mon Sep 17 00:00:00 2001
|
||||
From: Chong Lu <Chong.Lu@windriver.com>
|
||||
Date: Tue, 26 Jun 2018 17:34:15 +0800
|
||||
Subject: [PATCH] vim: add knob whether elf.h are checked
|
||||
|
||||
Previously, it still was checked when there was no elf library in sysroots directory.
|
||||
Add knob to decide whether elf.h are checked or not.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
|
||||
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
||||
---
|
||||
src/configure.ac | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/src/configure.ac b/src/configure.ac
|
||||
index 0ee86ad..64736f0 100644
|
||||
--- a/src/configure.ac
|
||||
+++ b/src/configure.ac
|
||||
@@ -3192,11 +3192,18 @@ AC_TRY_COMPILE([#include <stdio.h>], [int x __attribute__((unused));],
|
||||
AC_MSG_RESULT(no))
|
||||
|
||||
dnl Checks for header files.
|
||||
+AC_MSG_CHECKING(whether or not to look for elf.h)
|
||||
+AC_ARG_ENABLE(elf-check,
|
||||
+ [ --enable-elf-check If elfutils, check for elf.h [default=no]],
|
||||
+ , enable_elf_check="no")
|
||||
+AC_MSG_RESULT($enable_elf_check)
|
||||
+if test "x$enable_elf_check" != "xno"; then
|
||||
AC_CHECK_HEADER(elf.h, HAS_ELF=1)
|
||||
dnl AC_CHECK_HEADER(dwarf.h, SVR4=1)
|
||||
if test "$HAS_ELF" = 1; then
|
||||
AC_CHECK_LIB(elf, main)
|
||||
fi
|
||||
+fi
|
||||
|
||||
AC_HEADER_DIRENT
|
||||
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
require vim_${PV}.bb
|
||||
|
||||
SUMMARY += " (with tiny features)"
|
||||
|
||||
PROVIDES_remove = "xxd"
|
||||
ALTERNATIVE_${PN}_remove = "xxd"
|
||||
|
||||
PACKAGECONFIG += "tiny"
|
||||
|
||||
do_install() {
|
||||
install -D -m 0755 ${S}/vim ${D}/${bindir}/vim.tiny
|
||||
}
|
||||
|
||||
ALTERNATIVE_PRIORITY = "90"
|
||||
ALTERNATIVE_TARGET = "${bindir}/vim.tiny"
|
||||
@ -1,117 +0,0 @@
|
||||
SUMMARY = "Vi IMproved - enhanced vi editor"
|
||||
SECTION = "console/utils"
|
||||
|
||||
PROVIDES = "xxd"
|
||||
DEPENDS = "ncurses gettext-native"
|
||||
# vimdiff doesn't like busybox diff
|
||||
RSUGGESTS_${PN} = "diffutils"
|
||||
LICENSE = "vim"
|
||||
LIC_FILES_CHKSUM = "file://../runtime/doc/uganda.txt;endline=287;md5=f1f82b42360005c70b8c19b0ef493f72"
|
||||
|
||||
SRC_URI = "git://github.com/vim/vim.git \
|
||||
file://disable_acl_header_check.patch;patchdir=.. \
|
||||
file://vim-add-knob-whether-elf.h-are-checked.patch;patchdir=.. \
|
||||
"
|
||||
SRCREV = "f1c118be93184e8e57e3e80b1b3383f464ed649e"
|
||||
|
||||
S = "${WORKDIR}/git/src"
|
||||
|
||||
VIMDIR = "vim${@d.getVar('PV').split('.')[0]}${@d.getVar('PV').split('.')[1]}"
|
||||
|
||||
inherit autotools-brokensep update-alternatives
|
||||
|
||||
CLEANBROKEN = "1"
|
||||
|
||||
# vim configure.in contains functions which got 'dropped' by autotools.bbclass
|
||||
do_configure () {
|
||||
rm -f auto/*
|
||||
touch auto/config.mk
|
||||
aclocal
|
||||
autoconf
|
||||
oe_runconf
|
||||
touch auto/configure
|
||||
touch auto/config.mk auto/config.h
|
||||
}
|
||||
|
||||
#Available PACKAGECONFIG options are gtkgui, acl, x11, tiny
|
||||
PACKAGECONFIG ??= ""
|
||||
PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)}"
|
||||
|
||||
PACKAGECONFIG[gtkgui] = "--enable-gtk2-test --enable-gui=gtk2,--enable-gui=no,gtk+,"
|
||||
PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl,"
|
||||
PACKAGECONFIG[x11] = "--with-x,--without-x,xt,"
|
||||
PACKAGECONFIG[tiny] = "--with-features=tiny,--with-features=big,,"
|
||||
PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,"
|
||||
PACKAGECONFIG[elfutils] = "--enable-elf-check,,elfutils,"
|
||||
|
||||
EXTRA_OECONF = " \
|
||||
--disable-gpm \
|
||||
--disable-gtktest \
|
||||
--disable-xim \
|
||||
--disable-netbeans \
|
||||
--with-tlib=ncurses \
|
||||
ac_cv_small_wchar_t=no \
|
||||
vim_cv_getcwd_broken=no \
|
||||
vim_cv_memmove_handles_overlap=yes \
|
||||
vim_cv_stat_ignores_slash=no \
|
||||
vim_cv_terminfo=yes \
|
||||
vim_cv_tgetent=non-zero \
|
||||
vim_cv_toupper_broken=no \
|
||||
vim_cv_tty_group=world \
|
||||
STRIP=/bin/true \
|
||||
"
|
||||
|
||||
do_install() {
|
||||
autotools_do_install
|
||||
|
||||
# Work around file-rdeps picking up csh, awk, perl or python as a dep
|
||||
chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/vim132
|
||||
chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/mve.awk
|
||||
chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/*.pl
|
||||
chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/*.py
|
||||
|
||||
# Install example vimrc from runtime files
|
||||
install -m 0644 ../runtime/vimrc_example.vim ${D}/${datadir}/${BPN}/vimrc
|
||||
|
||||
# we use --with-features=big as default
|
||||
mv ${D}${bindir}/${BPN} ${D}${bindir}/${BPN}.${BPN}
|
||||
}
|
||||
|
||||
PARALLEL_MAKEINST = ""
|
||||
|
||||
PACKAGES =+ "${PN}-common ${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-tools"
|
||||
FILES_${PN}-syntax = "${datadir}/${BPN}/${VIMDIR}/syntax"
|
||||
FILES_${PN}-help = "${datadir}/${BPN}/${VIMDIR}/doc"
|
||||
FILES_${PN}-tutor = "${datadir}/${BPN}/${VIMDIR}/tutor ${bindir}/${BPN}tutor"
|
||||
FILES_${PN}-vimrc = "${datadir}/${BPN}/vimrc"
|
||||
FILES_${PN}-data = "${datadir}/${BPN}"
|
||||
FILES_${PN}-tools = "${datadir}/${BPN}/${VIMDIR}/tools"
|
||||
FILES_${PN}-common = " \
|
||||
${datadir}/${BPN}/${VIMDIR}/*.vim \
|
||||
${datadir}/${BPN}/${VIMDIR}/autoload \
|
||||
${datadir}/${BPN}/${VIMDIR}/colors \
|
||||
${datadir}/${BPN}/${VIMDIR}/compiler \
|
||||
${datadir}/${BPN}/${VIMDIR}/ftplugin \
|
||||
${datadir}/${BPN}/${VIMDIR}/indent \
|
||||
${datadir}/${BPN}/${VIMDIR}/keymap \
|
||||
${datadir}/${BPN}/${VIMDIR}/lang \
|
||||
${datadir}/${BPN}/${VIMDIR}/macros \
|
||||
${datadir}/${BPN}/${VIMDIR}/plugin \
|
||||
${datadir}/${BPN}/${VIMDIR}/print \
|
||||
${datadir}/${BPN}/${VIMDIR}/spell \
|
||||
${datadir}/icons \
|
||||
"
|
||||
|
||||
RDEPENDS_${BPN} = "ncurses-terminfo-base"
|
||||
# Recommend that runtime data is installed along with vim
|
||||
RRECOMMENDS_${BPN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-common"
|
||||
|
||||
ALTERNATIVE_${PN} = "vi vim xxd"
|
||||
ALTERNATIVE_PRIORITY = "100"
|
||||
ALTERNATIVE_TARGET = "${bindir}/${BPN}.${BPN}"
|
||||
ALTERNATIVE_LINK_NAME[vi] = "${base_bindir}/vi"
|
||||
ALTERNATIVE_LINK_NAME[vim] = "${bindir}/vim"
|
||||
ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd"
|
||||
ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd"
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
@ -1,16 +0,0 @@
|
||||
DESCRIPTION = "A filtering proxy for D-Bus connections"
|
||||
SUMMARY = "A filtering proxy for D-Bus connections"
|
||||
HOMEPAGE = "https://github.com/flatpak/xdg-dbus-proxy"
|
||||
|
||||
LICENSE = "LGPLv2.1"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
|
||||
|
||||
DEPENDS = "autoconf-archive-native glib-2.0"
|
||||
|
||||
inherit autotools gnomebase gtk-icon-cache mime
|
||||
|
||||
SRCREV = "9f6c5624f0dd57a8e301cd84c5525298bb754ed8"
|
||||
SRC_URI = "git://github.com/flatpak/xdg-dbus-proxy.git;protocol=https"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user