From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wi0-f180.google.com ([209.85.212.180]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1UJ6MD-0000Hm-TG for openembedded-core@lists.openembedded.org; Fri, 22 Mar 2013 19:06:29 +0100 Received: by mail-wi0-f180.google.com with SMTP id c10so44509wiw.7 for ; Fri, 22 Mar 2013 10:49:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:in-reply-to:references:x-gm-message-state; bh=Bm2bzzn4aQgACt71vE2pFiKiP534t89L7Mzuep7wgrs=; b=U4kY7bvibyuReWFIAGl7KpRgh7FV84re3kOWv3xNm2LM4z7FYrdB7fKoRjFbH6F6pW rvAiI4LDmIr4btEUWhi3bfRzTaGQ8CmBJ98RWV+YEO9trlOai3ojLRrTPBNCBSY7rOlt r5IcSevpdZoi6T6jKgm56TkGdlm/BqAOdPo8hMnqJWeie9oVFVnhghvqQl3K+6Rm1hME 8RD5UyDkZc9c2XB16wN/DmUifB0fqYGxAZYFoUJ59KUr26gW5PpRnPW7m9yXJRwStiWs 5NMnLQqU8LRG5lH0ttpk8iL0EYiNi53VRsYacLVLUswbSxcGQHTEWBsO35hpNLH7PdW4 K2Rg== X-Received: by 10.194.133.198 with SMTP id pe6mr4821450wjb.9.1363974116695; Fri, 22 Mar 2013 10:41:56 -0700 (PDT) Received: from melchett.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by mx.google.com with ESMTPS id dm9sm12260880wib.3.2013.03.22.10.41.55 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 22 Mar 2013 10:41:55 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 22 Mar 2013 17:38:40 +0000 Message-Id: X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQlqrRbu+onEGcYVygYSuwt+VjSomZDhHZtAmPCMe8kYLdmphFfS6tGNh0/qtJA4SIwDuKj7 Cc: openembedded-devel@lists.openembedded.org Subject: [PATCH 20/22] Revert "base-files: add fstab for systemd based systems" X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Mar 2013 18:06:37 -0000 From: Andreas Oberritter For hybrid systemd/sysvinit builds, only one fstab can be used. The default fstab used by sysvinit should work fine with systemd. Since virtually every machine will ship its own fstab in its bsp layer, the bsp layer may decide how to override the fstab based on distro features. This reverts commit 77bbb839ba25b974a538b90d346b454ccd5deefd. Signed-off-by: Andreas Oberritter Signed-off-by: Ross Burton --- meta/recipes-core/base-files/base-files/fstab.systemd | 9 --------- meta/recipes-core/base-files/base-files_3.0.14.bb | 7 +------ 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 meta/recipes-core/base-files/base-files/fstab.systemd diff --git a/meta/recipes-core/base-files/base-files/fstab.systemd b/meta/recipes-core/base-files/base-files/fstab.systemd deleted file mode 100644 index cb48a0d..0000000 --- a/meta/recipes-core/base-files/base-files/fstab.systemd +++ /dev/null @@ -1,9 +0,0 @@ -# stock fstab - you probably want to override this with a machine specific one - -rootfs / auto defaults 1 1 -tmpfs /var/volatile tmpfs defaults 0 0 -tmpfs /media/ram tmpfs defaults 0 0 - -# uncomment this if your device has a SD/MMC/Transflash slot -#/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 - diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb index e7a9d82..a56450d 100644 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb @@ -18,7 +18,6 @@ SRC_URI = "file://rotation \ file://profile \ file://shells \ file://fstab \ - file://fstab.systemd \ file://filesystems \ file://issue.net \ file://issue \ @@ -92,11 +91,7 @@ do_install () { install -m 0644 ${WORKDIR}/rotation ${D}${sysconfdir}/rotation fi - if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -m 0644 ${WORKDIR}/fstab.systemd ${D}${sysconfdir}/fstab - else - install -m 0644 ${WORKDIR}/fstab ${D}${sysconfdir}/fstab - fi + install -m 0644 ${WORKDIR}/fstab ${D}${sysconfdir}/fstab install -m 0644 ${WORKDIR}/filesystems ${D}${sysconfdir}/filesystems install -m 0644 ${WORKDIR}/usbd ${D}${sysconfdir}/default/usbd sed -i "s#ROOTHOME#${ROOT_HOME}#" ${WORKDIR}/profile -- 1.7.10.4