Merge commit 'f3ffbf4db3a4a6a8c375e44c8d03f63bd4851afb' into dora
This commit is contained in:
commit
ba68c05621
|
@ -30,8 +30,8 @@ USE_NLS = "no"
|
|||
# We don't need x11, nfc, selinux, pam in our builds
|
||||
DISTRO_FEATURES_remove = "x11 nfc selinux pam"
|
||||
|
||||
# Get rid off XZ for systemd
|
||||
PACKAGECONFIG_pn-systemd = "ldconfig"
|
||||
# Get rid off XZ, xkbcommon, pam, selinux for systemd and many more now
|
||||
PACKAGECONFIG_pn-systemd = "compat ldconfig binfmt sysusers randomseed myhostname firstboot utmp"
|
||||
|
||||
# From fido on.. build curl with libssl to avoid gnutls
|
||||
PACKAGECONFIG_pn-curl="ipv6 ssl zlib"
|
||||
|
|
|
@ -3,7 +3,7 @@ LICENSE = "MIT"
|
|||
LIC_FILES_CHKSUM = " \
|
||||
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
||||
ALLOW_EMPTY_${PN} = "1"
|
||||
PR = "r20"
|
||||
PR = "r21"
|
||||
|
||||
RDEPENDS_${PN} = "\
|
||||
task-sysmocom-tools \
|
||||
|
@ -16,4 +16,4 @@ RDEPENDS_${PN} = "\
|
|||
logrotate python-jsonrpclib python-enum iputils \
|
||||
packagegroup-sysmobts-sob rtl8169-eeprom autossh \
|
||||
perl libdbd-sqlite-perl libdbi-perl libjson-perl \
|
||||
netcat-openbsd perf"
|
||||
netcat-openbsd perf lksctp-tools"
|
||||
|
|
|
@ -27,8 +27,8 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g
|
|||
|
||||
PR = "r9"
|
||||
|
||||
SRC_URI[md5sum] = "65d8cdfae4722226fbe29863477641ed"
|
||||
SRC_URI[sha256sum] = "948274b88f1ed002d867ced6aaefdfd0999668b11285ac2b3a67ff2629d59d88"
|
||||
SRC_URI[md5sum] = "60049f51e9c8305afe30eb22b711c5c6"
|
||||
SRC_URI[sha256sum] = "583d0e1c573ace30a9c6afbea0fc52cae9c8c916dbc15c026e485a0dda4ba048"
|
||||
|
||||
inherit autotools update-rc.d useradd systemd pkgconfig
|
||||
|
||||
|
@ -101,6 +101,10 @@ do_install_append() {
|
|||
|
||||
install -d ${D}${systemd_unitdir}/ntp-units.d
|
||||
install -m 0644 ${WORKDIR}/ntpd.list ${D}${systemd_unitdir}/ntp-units.d/60-ntpd.list
|
||||
|
||||
if [ `ls -A ${D}${libexecdir} | wc -l` -eq 0 ]; then
|
||||
rm -rf ${D}${libexecdir}
|
||||
fi
|
||||
}
|
||||
|
||||
PACKAGES += "ntpdate sntp ${PN}-tickadj ${PN}-utils ${PN}-perl"
|
|
@ -7,7 +7,7 @@ PR = "r5"
|
|||
DEPENDS = "bison-native flex-native"
|
||||
PACKAGE_ARCH = "${MACHINE_ARCH}"
|
||||
|
||||
SRC_URI = "https://downloads.openwrt.org/sources/lm_sensors-${PV}.tar.bz2"
|
||||
SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/lm_sensors/lm_sensors-${PV}.tar.bz2/829d88fb09d67723fbf42853eb84d1fd/lm_sensors-${PV}.tar.bz2"
|
||||
|
||||
SRC_URI[md5sum] = "829d88fb09d67723fbf42853eb84d1fd"
|
||||
SRC_URI[sha256sum] = "bde7e1d8b473bca6528694b696668c4cd0a28515aef36b961e4f7d8a6b47e581"
|
||||
|
|
|
@ -1,17 +0,0 @@
|
|||
Index: iproute2-4.3.0/misc/Makefile
|
||||
===================================================================
|
||||
--- iproute2-4.3.0.orig/misc/Makefile 2015-12-03 17:17:49.164492802 +0100
|
||||
+++ iproute2-4.3.0/misc/Makefile 2015-12-03 17:18:39.368493469 +0100
|
||||
@@ -5,9 +5,9 @@
|
||||
|
||||
include ../Config
|
||||
|
||||
-ifeq ($(HAVE_BERKELEY_DB),y)
|
||||
- TARGETS += arpd
|
||||
-endif
|
||||
+#ifeq ($(HAVE_BERKELEY_DB),y)
|
||||
+# TARGETS += arpd
|
||||
+#endif
|
||||
|
||||
ifeq ($(HAVE_SELINUX),y)
|
||||
LDLIBS += $(shell pkg-config --libs libselinux)
|
|
@ -1 +1,4 @@
|
|||
require recipes-fixes/iproute2/${PN}_sysmocom.inc
|
||||
PACKAGES += "${PN}-misc"
|
||||
ALLOW_EMPTY_${PN}-misc = "1"
|
||||
|
||||
RDEPENDS_${PN}-misc = "${PN}-ss ${PN}-nstat ${PN}-ifstat ${PN}-rtacct ${PN}-lnstat"
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
require recipes-fixes/${PN}/${PN}_sysmocom.inc
|
Loading…
Reference in New Issue