From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0918F1396D9 for ; Fri, 17 Nov 2017 22:04:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29CC0E0BF6; Fri, 17 Nov 2017 22:04:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 03818E0BF6 for ; Fri, 17 Nov 2017 22:04:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EB6E233C6B6 for ; Fri, 17 Nov 2017 22:04:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AB32C9E49 for ; Fri, 17 Nov 2017 22:04:18 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1510956230.77e9c6f275399cdef64d432a19da51bc9c9cd0bf.williamh@gentoo> Subject: [gentoo-commits] proj/baselayout:master commit in: / X-VCS-Repository: proj/baselayout X-VCS-Files: Makefile X-VCS-Directories: / X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 77e9c6f275399cdef64d432a19da51bc9c9cd0bf X-VCS-Branch: master Date: Fri, 17 Nov 2017 22:04:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 64c063fa-e75a-4ed2-8eff-8ef990180efe X-Archives-Hash: 2f3910d94eb2bd2f24a1067fbb7839d4 commit: 77e9c6f275399cdef64d432a19da51bc9c9cd0bf Author: William Hubbs gentoo org> AuthorDate: Fri Nov 17 22:03:50 2017 +0000 Commit: William Hubbs gentoo org> CommitDate: Fri Nov 17 22:03:50 2017 +0000 URL: https://gitweb.gentoo.org/proj/baselayout.git/commit/?id=77e9c6f2 add layout-usrmerge to optionally support the /usr merge Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index 9181c7d7..966e71ac 100644 --- a/Makefile +++ b/Makefile @@ -90,6 +90,11 @@ layout: layout-dirs layout-$(OS) # FHS compatibility symlinks stuff ln -snf /var/tmp $(DESTDIR)/usr/tmp +layout-usrmerge: layout + ln -snf usr/bin ${DESTDIR}/bin + ln -snf usr/sbin ${DESTDIR}/sbin + ln -snf bin ${DESTDIR}/usr/sbin + live: rm -rf /tmp/$(PKG) cp -r . /tmp/$(PKG)