From patchwork Fri Mar 20 19:14:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Williams X-Patchwork-Id: 452778 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 D96671400D5 for ; Sat, 21 Mar 2015 06:15:42 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 187CE926C2; Fri, 20 Mar 2015 19:15: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 YCCYJMSP8OIU; Fri, 20 Mar 2015 19:15:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 622C9926DD; Fri, 20 Mar 2015 19:15:33 +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 C119C1C2357 for ; Fri, 20 Mar 2015 19:15:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BD8D4926AE for ; Fri, 20 Mar 2015 19:15:01 +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 SGZINn6SMrG6 for ; Fri, 20 Mar 2015 19:15:01 +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 272369259B for ; Fri, 20 Mar 2015 19:15:01 +0000 (UTC) Received: by ykek76 with SMTP id k76so47301935yke.0 for ; Fri, 20 Mar 2015 12:15:00 -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=aLfXWyL+Wu7Fdiv1BkLsw2rLp5ee8NOweHyxgEuB2e8=; b=O4e1dfwOF1zXMLG3xUjoFuCOgwMOP7iBvIN/2ggZQ1mMegu+PJrGqg/jdp0JJ8Rgml W32R9CKsY03x2d9E09DA/7yy286tbH2Gu/pn3vxRRzjB1kMsKKmka0LQ0fwBIXdeJoLx 56s4Syu6ZXEsdbQsOlh53ZDZxw8ur0lEPtKiwTsdhVpE0jaV8I2X/sg0dDMwxjXupCDW BivHPh81SU6e3MhsYl1PtAJ3LWUlzVpoF1XFxf5kGLvkJSvIJGjz8tBTVi8DSGp53V/V Zl5GpYntMlEYoO7uBRBV8w1fNfOuZt4Iuz/Q8zqed7l1fKdy3RGrJ+kgr3Kwg3W+aoj9 KzQA== X-Gm-Message-State: ALoCoQmQu2CyyS732naudzA7s2iJxOkzVvAO+ZyZbFaEr+HsZ7m5vj4bXLJn6hdwBdRX+THCAMQk X-Received: by 10.236.222.138 with SMTP id t10mr76528636yhp.102.1426878900488; Fri, 20 Mar 2015 12:15:00 -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.59 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 Mar 2015 12:14:59 -0700 (PDT) From: Mike Williams To: buildroot@busybox.net Date: Fri, 20 Mar 2015 15:14:16 -0400 Message-Id: <1426878856-15747-26-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 25/25] gpsd: fix udev and systemd support 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" systemd should be enabled based on buildroot configuration, not host systemd presence. SConstruct file had to be patched to install systemd service files in /usr/lib; passed systemd_dir is overridden. Signed-off-by: Mike Williams --- package/gpsd/0004-fix-systemd-service-path.patch | 13 +++++++++++++ package/gpsd/gpsd.mk | 15 ++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 package/gpsd/0004-fix-systemd-service-path.patch diff --git a/package/gpsd/0004-fix-systemd-service-path.patch b/package/gpsd/0004-fix-systemd-service-path.patch new file mode 100644 index 0000000..2f1d8e7 --- /dev/null +++ b/package/gpsd/0004-fix-systemd-service-path.patch @@ -0,0 +1,13 @@ +diff --git a/SConstruct b/SConstruct +index 1afd28a..4be0189 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -90,7 +90,7 @@ def _getoutput(cmd, input=None, cwd=None, env=None): + # Start by reading configuration variables from the cache + opts = Variables('.scons-option-cache') + +-systemd_dir = '/lib/systemd/system' ++systemd_dir = '/usr/lib/systemd/system' + systemd = os.path.exists(systemd_dir) + + # Set distribution-specific defaults here diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index 3e6411b..e662eab 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -21,7 +21,14 @@ GPSD_SCONS_OPTS = \ prefix=/usr\ sysroot=$(STAGING_DIR)\ strip=no\ - python=no + python=no\ + udevdir=/usr/lib/udev + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) + GPSD_SCONS_OPTS += systemd=yes +else + GPSD_SCONS_OPTS += systemd=no +endif ifeq ($(BR2_PACKAGE_NCURSES),y) GPSD_DEPENDENCIES += ncurses @@ -213,6 +220,12 @@ define GPSD_INSTALL_INIT_SYSV $(SED) 's,^DEVICES=.*,DEVICES=$(BR2_PACKAGE_GPSD_DEVICES),' $(TARGET_DIR)/etc/init.d/S50gpsd endef +define GPSD_INSTALL_INIT_SYSTEMD + mkdir -p /etc/systemd/system/multi-user.target.wants + ln -fs ../../../../usr/lib/systemd/system/gpsd.socket \ + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants +endef + define GPSD_INSTALL_STAGING_CMDS (cd $(@D); \ $(GPSD_SCONS_ENV) \