From 4d2f15fb464148b914b0f43ddb90f61320a9f0dd Mon Sep 17 00:00:00 2001 From: David Rheinsberg Date: Mon, 4 May 2020 09:23:13 +0200 Subject: [PATCH] modules: drop `osbuild` symlink Drop the `osbuild -> ../osbuild` symlink from all module directories. We now properly initialize the PYTHONPATH to provide the imported osbuild module from the host environment. Therefore, these links are no longer needed. The sources run from the host environment, so they should just pick them up from the environment the same way osbuild itself does. --- assemblers/osbuild | 1 - osbuild.spec | 4 ---- runners/osbuild | 1 - sources/osbuild | 1 - stages/osbuild | 1 - 5 files changed, 8 deletions(-) delete mode 120000 assemblers/osbuild delete mode 120000 runners/osbuild delete mode 120000 sources/osbuild delete mode 120000 stages/osbuild diff --git a/assemblers/osbuild b/assemblers/osbuild deleted file mode 120000 index d41e248d..00000000 --- a/assemblers/osbuild +++ /dev/null @@ -1 +0,0 @@ -../osbuild \ No newline at end of file diff --git a/osbuild.spec b/osbuild.spec index 2bcdfff8..136e27b0 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -75,19 +75,15 @@ make man mkdir -p %{buildroot}%{pkgdir}/stages install -p -m 0755 $(find stages/* -not -path "*/osbuild") %{buildroot}%{pkgdir}/stages/ -ln -s ../osbuild %{buildroot}%{pkgdir}/stages/osbuild mkdir -p %{buildroot}%{pkgdir}/assemblers install -p -m 0755 $(find assemblers/* -not -path "*/osbuild") %{buildroot}%{pkgdir}/assemblers/ -ln -s ../osbuild %{buildroot}%{pkgdir}/assemblers/osbuild mkdir -p %{buildroot}%{pkgdir}/runners install -p -m 0755 $(find runners/* -not -path "*/osbuild") %{buildroot}%{pkgdir}/runners -ln -s ../osbuild %{buildroot}%{pkgdir}/runners/osbuild mkdir -p %{buildroot}%{pkgdir}/sources install -p -m 0755 $(find sources/* -not -path "*/osbuild") %{buildroot}%{pkgdir}/sources -ln -s ../osbuild %{buildroot}%{pkgdir}/sources/osbuild # mount point for bind mounting the osbuild library mkdir -p %{buildroot}%{pkgdir}/osbuild diff --git a/runners/osbuild b/runners/osbuild deleted file mode 120000 index d41e248d..00000000 --- a/runners/osbuild +++ /dev/null @@ -1 +0,0 @@ -../osbuild \ No newline at end of file diff --git a/sources/osbuild b/sources/osbuild deleted file mode 120000 index d41e248d..00000000 --- a/sources/osbuild +++ /dev/null @@ -1 +0,0 @@ -../osbuild \ No newline at end of file diff --git a/stages/osbuild b/stages/osbuild deleted file mode 120000 index d41e248d..00000000 --- a/stages/osbuild +++ /dev/null @@ -1 +0,0 @@ -../osbuild \ No newline at end of file