mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@26c91a9
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
OPENRC_VERSION = 0.41.2
|
||||
OPENRC_VERSION = 0.42.1
|
||||
OPENRC_SITE = $(call github,OpenRC,openrc,$(OPENRC_VERSION))
|
||||
OPENRC_LICENSE = BSD-2-Clause
|
||||
OPENRC_LICENSE_FILES = LICENSE
|
||||
@@ -18,7 +18,6 @@ OPENRC_MAKE_OPTS = \
|
||||
LIBNAME=lib \
|
||||
LIBEXECDIR=/usr/libexec/rc \
|
||||
MKPKGCONFIG=no \
|
||||
MKSELINUX=no \
|
||||
MKSYSVINIT=yes \
|
||||
BRANDING="Buildroot $(BR2_VERSION_FULL)" \
|
||||
CC=$(TARGET_CC)
|
||||
@@ -29,17 +28,65 @@ else
|
||||
OPENRC_MAKE_OPTS += MKSTATICLIBS=yes
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
|
||||
OPENRC_MAKE_OPTS += MKSELINUX=yes
|
||||
OPENRC_DEPENDENCIES += libselinux
|
||||
else
|
||||
OPENRC_MAKE_OPTS += MKSELINUX=no
|
||||
endif
|
||||
|
||||
define OPENRC_BUILD_CMDS
|
||||
$(MAKE) $(OPENRC_MAKE_OPTS) -C $(@D)
|
||||
endef
|
||||
|
||||
define OPENRC_INSTALL_TARGET_CMDS
|
||||
$(MAKE) $(OPENRC_MAKE_OPTS) DESTDIR=$(TARGET_DIR) -C $(@D) install
|
||||
$(INSTALL) -D -m 0755 $(OPENRC_PKGDIR)/sysv-rcs \
|
||||
$(TARGET_DIR)/etc/init.d/sysv-rcs
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_PACKAGE_KBD),)
|
||||
# keymaps and save-keymaps require kbd_mode and dumpkeys, respectively, so
|
||||
# remove them if the kbd package is not selected (e.g. devices with serial
|
||||
# console, only).
|
||||
define OPENRC_NO_KBD
|
||||
$(RM) $(TARGET_DIR)/etc/runlevels/boot/{keymaps,save-keymaps}
|
||||
$(RM) $(TARGET_DIR)/etc/init.d/{keymaps,save-keymaps}
|
||||
$(RM) $(TARGET_DIR)/etc/conf.d/keymaps
|
||||
endef
|
||||
OPENRC_POST_INSTALL_TARGET_HOOKS += OPENRC_NO_KBD
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NETIFRC),y)
|
||||
# netifrc replaces network, staticroute and loopback services which are
|
||||
# installed by openrc
|
||||
define OPENRC_NO_NET
|
||||
$(RM) $(TARGET_DIR)/etc/runlevels/boot/{network,staticroute,loopback}
|
||||
$(RM) $(TARGET_DIR)/etc/init.d/{network,staticroute,loopback}
|
||||
$(RM) $(TARGET_DIR)/etc/conf.d/{network,staticroute,loopback}
|
||||
endef
|
||||
OPENRC_POST_INSTALL_TARGET_HOOKS += OPENRC_NO_NET
|
||||
endif
|
||||
|
||||
define OPENRC_REMOVE_UNNEEDED
|
||||
$(RM) -r $(TARGET_DIR)/usr/share/openrc
|
||||
endef
|
||||
OPENRC_TARGET_FINALIZE_HOOKS += OPENRC_REMOVE_UNNEEDED
|
||||
|
||||
ifeq ($(BR2_TARGET_GENERIC_GETTY),y)
|
||||
OPENRC_GETTY_SVCNAME = agetty.$(SYSTEM_GETTY_PORT)
|
||||
OPENRC_GETTY_CONF_D = $(TARGET_DIR)/etc/conf.d/$(OPENRC_GETTY_SVCNAME)
|
||||
define OPENRC_SET_GETTY
|
||||
{ \
|
||||
echo "baud=\"$(SYSTEM_GETTY_BAUDRATE)\""; \
|
||||
echo "term_type=\"$(SYSTEM_GETTY_TERM)\"" ; \
|
||||
echo "agetty_options=\"-L $(SYSTEM_GETTY_OPTIONS)\""; \
|
||||
} > $(OPENRC_GETTY_CONF_D)
|
||||
ln -sf agetty $(TARGET_DIR)/etc/init.d/$(OPENRC_GETTY_SVCNAME)
|
||||
ln -sf /etc/init.d/$(OPENRC_GETTY_SVCNAME) \
|
||||
$(TARGET_DIR)/etc/runlevels/default/$(OPENRC_GETTY_SVCNAME)
|
||||
endef
|
||||
OPENRC_TARGET_FINALIZE_HOOKS += OPENRC_SET_GETTY
|
||||
endif # BR2_TARGET_GENERIC_GETTY
|
||||
|
||||
$(eval $(generic-package))
|
||||
|
||||
Reference in New Issue
Block a user