9deb373671
This patch includes the update of patch upstream status of the following recipes (50 in all): grub pciutils setserial dhcp iproute2 libnss-mdns nfs-utils openssl portmap busybox coreutils dbus dropbear ncurses readline sysfsutils sysvinit tinylogin udev update-rc.d util-linux elfutils file pkgconfig syslinux ubootchart yaffs2 findutils gamin hdparm libaio libzypp parted procps sat-solver screen sed sysklogd tcp-wrapper time zypper attr boost createrepo gnutls hal js libgcrypt libnl libusb-compat (From OE-Core rev: 1e6f767663b7d5fb6277fd2b214f4a50e24d4ffd) Signed-off-by: Qing He <qing.he@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
26 lines
663 B
Diff
26 lines
663 B
Diff
Upstream-Status: Inappropriate [configuration]
|
|
|
|
# The src Makefile was checking for libcrypt.a on the host, not in the
|
|
# build environment. This patch checks for $LCRYPT in the environment
|
|
# and uses it if it's there.
|
|
# - jdike@linux.intel.com
|
|
|
|
Index: sysvinit-2.88dsf/src/Makefile
|
|
===================================================================
|
|
--- sysvinit-2.88dsf.orig/src/Makefile
|
|
+++ sysvinit-2.88dsf/src/Makefile
|
|
@@ -85,9 +85,13 @@ else
|
|
endif
|
|
|
|
# Additional libs for GNU libc.
|
|
+ifneq ($(LCRYPT),)
|
|
+ SULOGINLIBS += $(LCRYPT)
|
|
+else
|
|
ifneq ($(wildcard /usr/lib*/libcrypt.a),)
|
|
SULOGINLIBS += -lcrypt
|
|
endif
|
|
+endif
|
|
|
|
all: $(BIN) $(SBIN) $(USRBIN)
|
|
|