8000 host flavor: fix copying for Debian by alban · Pull Request #1811 · rkt/rkt · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This repository was archived by the owner on Feb 24, 2020. It is now read-only.

host flavor: fix copying for Debian #1811

Merged
merged 2 commits into from
Nov 30, 2015
Merged

host flavor: fix copying for Debian #1811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
306fe5b
Godeps: update goaci to latest master
iaguis Nov 30, 2015
ec44009
host flavor: fix copying for Debian
alban Nov 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Godeps/Godeps.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 28 additions & 1 deletion Godeps/_workspace/src/github.com/appc/goaci/proj2aci/asset.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion stage1/init/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ func installAssets() error {
return err
}

systemdUnitsPath := "/usr/lib/systemd/system"
systemdUnitsPath := "/lib/systemd/system"
assets := []string{
proj2aci.GetAssetString("/usr/lib/systemd/systemd", systemdBin),
proj2aci.GetAssetString("/usr/bin/systemctl", systemctlBin),
Expand Down
11 changes: 9 additions & 2 deletions stage1/usr_from_host/usr_from_host.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,15 @@ S1_RF_USR_STAMPS += $(UFH_STAMP)

$(call generate-stamp-rule,$(UFH_STAMP),,$(S1_RF_ACIROOTFSDIR), \
$(call vb,v2,LN SF,host $(S1_RF_ACIROOTFSDIR)/flavor) \
ln -sf 'host' "$(S1_RF_ACIROOTFSDIR)/flavor")
ln -sf 'host' "$(S1_RF_ACIROOTFSDIR)/flavor" && \
mkdir -p "$(S1_RF_ACIROOTFSDIR)/usr/lib" && \
ln -sf usr/lib "$(S1_RF_ACIROOTFSDIR)/lib" && \
ln -sf usr/lib "$(S1_RF_ACIROOTFSDIR)/lib64"&& \
ln -sf lib "$(S1_RF_ACIROOTFSDIR)/usr/lib64")

CLEAN_SYMLINKS += $(S1_RF_ACIROOTFSDIR)/flavor

CLEAN_SYMLINKS += $(S1_RF_ACIROOTFSDIR)/flavor $(S1_RF_ACIROOTFSDIR)/lib $(S1_RF_ACIROOTFSDIR)/lib64 $(S1_RF_ACIROOTFSDIR)/usr/lib64

CLEAN_DIRS += $(S1_RF_ACIROOTFSDIR)/usr/lib

$(call undefine-namespaces,UFH)
0