From patchwork Thu Mar 19 17:56:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Williams X-Patchwork-Id: 452128 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 64F5114012F for ; Fri, 20 Mar 2015 04:58:17 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9880D92264; Thu, 19 Mar 2015 17:58:16 +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 PK4UQqH2HOBB; Thu, 19 Mar 2015 17:58:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 60CD3922CE; Thu, 19 Mar 2015 17:57:46 +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 DEB7E1C2607 for ; Thu, 19 Mar 2015 17:57:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D1F5992274 for ; Thu, 19 Mar 2015 17:57:42 +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 cftqDITt3xYc for ; Thu, 19 Mar 2015 17:57:38 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-yk0-f176.google.com (mail-yk0-f176.google.com [209.85.160.176]) by whitealder.osuosl.org (Postfix) with ESMTPS id D17549229E for ; Thu, 19 Mar 2015 17:57:23 +0000 (UTC) Received: by ykfc206 with SMTP id c206so31242937ykf.1 for ; Thu, 19 Mar 2015 10:57:23 -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=3GOdDtyJygXqmmxRF5T/iA3RgJS+/UJNeXomWs5rq3s=; b=ECrVZE2vbsj8RMu894ekWnQ0Ow656svLqdBSd2XXtA0ONSwn++faRRNFq97tE9RFXi qavvWxJwEboGXkhC5ta5+mngwkNQxYTXoqrDfDjee4TZvBnyz8Wl8badInJ1xO9T8+E5 moqB9oBsEq8azB/tIAiPlAPccsjN9GyB1TrXuUKjx0zec86D4f1QgZ2FiSbTWyws/+7P KETyKWrvRc9P7M90btS8GDiSzEPwhwN35vD4WeIBPDC96CiyQJvGeToVurpq2DOQxdtr 6C30JK0mPps1Lcb0yKJFsjJm9LrdMdls4qcoLLPtggtZEy/YNyMhJh39RZ3kDG5bJT5P iBZQ== X-Gm-Message-State: ALoCoQkUUE6saDsFWApft17sEz2EZd0hBhFmgSvBTvuI+pShppmQnpq7FXaRHIyMll4AaDcKWLM2 X-Received: by 10.236.110.10 with SMTP id t10mr78627088yhg.35.1426787843200; Thu, 19 Mar 2015 10:57:23 -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 e48sm1527034yho.30.2015.03.19.10.57.21 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Mar 2015 10:57:22 -0700 (PDT) From: Mike Williams To: buildroot@busybox.net Date: Thu, 19 Mar 2015 13:56:47 -0400 Message-Id: <1426787807-29510-16-git-send-email-mike@mikebwilliams.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1426787807-29510-1-git-send-email-mike@mikebwilliams.com> References: <1426787807-29510-1-git-send-email-mike@mikebwilliams.com> Subject: [Buildroot] [PATCH 15/15] 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 Reviewed-by: Steven Noonan Reviewed-by: Samuel Martin --- package/systemd/systemd.mk | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 98bda02..3ec124c 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 \ @@ -100,16 +98,16 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) SYSTEMD_CONF_OPTS += --enable-networkd define SYSTEMD_INSTALL_RESOLVCONF_HOOK - ln -sf ../run/systemd/resolve/resolv.conf \ + ln -sf /run/systemd/resolve/resolv.conf \ $(TARGET_DIR)/etc/resolv.conf endef 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,12 @@ 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 +155,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 +197,7 @@ define SYSTEMD_INSTALL_SERVICE_TTY else \ SERVICE="serial-getty"; \ fi; \ - ln -fs ../../../../lib/systemd/system/$${SERVICE}@.service \ + 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