From patchwork Fri Mar 20 19:14:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Williams X-Patchwork-Id: 452774 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id EAC1B1400D5 for ; Sat, 21 Mar 2015 06:15:35 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 19B65A4179; Fri, 20 Mar 2015 19:15:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ANkgvfqQ1YJm; Fri, 20 Mar 2015 19:15:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id A697CA4190; Fri, 20 Mar 2015 19:15:19 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 689AE1CEF18 for ; Fri, 20 Mar 2015 19:14:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 62A109259B for ; Fri, 20 Mar 2015 19:14:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DR6S9WTe94W3 for ; Fri, 20 Mar 2015 19:14:53 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-yk0-f180.google.com (mail-yk0-f180.google.com [209.85.160.180]) by whitealder.osuosl.org (Postfix) with ESMTPS id D1964926B2 for ; Fri, 20 Mar 2015 19:14:52 +0000 (UTC) Received: by ykfs63 with SMTP id s63so47270461ykf.2 for ; Fri, 20 Mar 2015 12:14:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BPTp4ISZ25rCubskTVsmtzcJR8tAfHCCEYnQWeJ3f9w=; b=btr0faLupTc0giouDICKny7hop+FouGOM0L73VFFNI6lWStzoF/5pk/JpCtquVX6l3 n9q9d3wKqyhhPXJAOJTqbLneY3xG9kiySIXtS1Y1bxV0paitNoGr4etj5KweRb77Lr+u wedv3ND2dOGGccJPBXCQTjt8mwCpfn2wyQI/nM4BFdjdWMJQw1RHw7WmYh5huCEhTsbd Bw8PWOPPW6ZGqqyLryYd2HoDcnHz9wEbo9NpElGfcQE8odkazrP3L/9CHVyLXv9dgUR3 XbTLk9ctxYBl1oDzfu/4UXIczun8xkBcquyC4wH5o8SvDIygneCwXrfaQwUOLMkwciu2 vttA== X-Gm-Message-State: ALoCoQmEmfp1X/1UaU/HJ1md1XYN2PTIkLzKWyH2LF3tGAPg4hFnbMAHimPAnTESMXoNBUsWBNxb X-Received: by 10.236.209.129 with SMTP id s1mr82126522yho.49.1426878892207; Fri, 20 Mar 2015 12:14:52 -0700 (PDT) Received: from mikework.lifesafer.com (FUSE-DEDICATED-66-42-228-99.fuse.net. [66.42.228.99]) by mx.google.com with ESMTPSA id c5sm4193119yhf.29.2015.03.20.12.14.50 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 Mar 2015 12:14:51 -0700 (PDT) From: Mike Williams To: buildroot@busybox.net Date: Fri, 20 Mar 2015 15:14:10 -0400 Message-Id: <1426878856-15747-20-git-send-email-mike@mikebwilliams.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1426878856-15747-1-git-send-email-mike@mikebwilliams.com> References: <1426878856-15747-1-git-send-email-mike@mikebwilliams.com> Subject: [Buildroot] [PATCH v2 19/25] systemd: change install path to /usr/lib X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" /usr/lib is the default path for upstream systemd. Signed-off-by: Mike Williams --- package/systemd/systemd.mk | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 98bda02..b2e69cc 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -27,8 +27,6 @@ SYSTEMD_DEPENDENCIES += busybox endif SYSTEMD_CONF_OPTS += \ - --with-rootprefix= \ - --with-rootlibdir=/lib \ --enable-static=no \ --disable-manpages \ --disable-selinux \ @@ -107,9 +105,9 @@ else SYSTEMD_CONF_OPTS += --disable-networkd define SYSTEMD_INSTALL_SERVICE_NETWORK $(INSTALL) -D -m 644 package/systemd/network.service \ - $(TARGET_DIR)/etc/systemd/system/network.service + $(TARGET_DIR)/usr/lib/systemd/system/network.service mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../network.service \ + ln -fs ../../../../usr/lib/systemd/system/network.service \ $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/network.service endef endif @@ -118,7 +116,7 @@ ifeq ($(BR2_PACKAGE_SYSTEMD_TIMESYNCD),y) SYSTEMD_CONF_OPTS += --enable-timesyncd define SYSTEMD_INSTALL_SERVICE_TIMESYNC mkdir -p $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants - ln -sf ../../../../lib/systemd/system/systemd-timesyncd.service \ + ln -sf ../../../../usr/lib/systemd/system/systemd-timesyncd.service \ $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service endef else @@ -144,12 +142,13 @@ SYSTEMD_MAKE_OPTS += LIBS=-lrt SYSTEMD_MAKE_OPTS += LDFLAGS+=-ldl define SYSTEMD_INSTALL_INIT_HOOK - ln -fs ../lib/systemd/systemd $(TARGET_DIR)/sbin/init - ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/halt - ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/poweroff - ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/reboot + ln -fs ../usr/lib/systemd/systemd $(TARGET_DIR)/sbin/init + ln -fs ../usr/bin/systemctl $(TARGET_DIR)/sbin/halt + ln -fs ../usr/bin/systemctl $(TARGET_DIR)/sbin/poweroff + ln -fs ../usr/bin/systemctl $(TARGET_DIR)/sbin/reboot - ln -fs ../../../lib/systemd/system/multi-user.target $(TARGET_DIR)/etc/systemd/system/default.target + ln -fs ../../../usr/lib/systemd/system/multi-user.target \ + $(TARGET_DIR)/etc/systemd/system/default.target endef define SYSTEMD_INSTALL_MACHINEID_HOOK @@ -157,14 +156,14 @@ define SYSTEMD_INSTALL_MACHINEID_HOOK endef define SYSTEMD_SANITIZE_PATH_IN_UNITS - find $(TARGET_DIR)/lib/systemd/system -name '*.service' \ + find $(TARGET_DIR)/usr/lib/systemd/system -name '*.service' \ -exec $(SED) 's,$(HOST_DIR),,g' {} \; endef # Disable ldconfig.service, as /sbin/ldconfig is not available when the # target is built with a glibc-based toolchain. define SYSTEMD_DISABLE_LDCONFIG_SERVICE_HOOK - rm -f $(TARGET_DIR)/lib/systemd/system/sysinit.target.wants/ldconfig.service + rm -f $(TARGET_DIR)/usr/lib/systemd/system/sysinit.target.wants/ldconfig.service endef SYSTEMD_POST_INSTALL_TARGET_HOOKS += \ @@ -199,7 +198,8 @@ define SYSTEMD_INSTALL_SERVICE_TTY else \ SERVICE="serial-getty"; \ fi; \ - ln -fs ../../../../lib/systemd/system/$${SERVICE}@.service \ + mkdir -p $(TARGET_DIR)/etc/systemd/system/getty.target.wants + ln -fs ../../../../usr/lib/systemd/system/$${SERVICE}@.service \ $(TARGET_DIR)/etc/systemd/system/getty.target.wants/$${SERVICE}@$(BR2_TARGET_GENERIC_GETTY_PORT).service endef endif