GNOME.org
 

[gnome-sdk-images] Convert /self to /app

commit 0580c30c328e5ef955c4aca7ce94193b19bbdabb
Author: Alexander Larsson <alexl redhat com>
Date:   Fri May 22 08:55:24 2015 +0200

    Convert /self to /app

 build.sh                                      |   12 ++++++------
 cd.sh                                         |    2 +-
 packages/.rpmmacros                           |    4 ++--
 packages/SOURCES/fontconfig-xdg-app.conf      |    6 +++---
 packages/SOURCES/rpm-macros                   |    2 +-
 packages/SPECS/freedesktop-platform-base.spec |    2 +-
 packages/SPECS/freedesktop-sdk.spec           |    4 ++--
 setup.sh                                      |    4 ++--
 setup_root.sh                                 |    2 +-
 9 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/build.sh b/build.sh
index 9769a80..4687ffb 100755
--- a/build.sh
+++ b/build.sh
@@ -10,7 +10,7 @@ XDG_APP_HELPER=`which xdg-app-helper 2> /dev/null`
 LINUX_USER_CHROOT=`which linux-user-chroot 2> /dev/null`
 
 declare -x LC_ALL=en_US.utf8
-declare -x HOME=/self/packages
+declare -x HOME=/app/packages
 unset CFLAGS
 unset CXXFLAGS
 unset LDFLAGS
@@ -28,20 +28,20 @@ unset PKG_CONFIG_PATH
 unset PYTHONPATH
 unset XDG_CONFIG_DIRS
 unset XDG_DATA_DIRS
-declare -x PATH="/usr/bin:/self/packages/bin"
+declare -x PATH="/usr/bin:/app/packages/bin"
 if test -d packages/.ccache; then
-    declare -x PATH="/self/packages/bin/ccache:$PATH"
+    declare -x PATH="/app/packages/bin/ccache:$PATH"
 fi
 
-echo "builduser:x:`id  -u`:`id -u`:Build user:/self/packages:/sbin/nologin" >> $ROOT/usr/etc/passwd
+echo "builduser:x:`id  -u`:`id -u`:Build user:/app/packages:/sbin/nologin" >> $ROOT/usr/etc/passwd
 echo "builduser:x:`id  -g`:" >> $ROOT/usr/etc/group
 
 rc=1
 if test "x${XDG_APP_HELPER}" != "x"; then
-    $XDG_APP_HELPER -w -W -E -a $SRC -v $VAR $ROOT/usr env PATH="$PATH" /self/cd.sh "$@"
+    $XDG_APP_HELPER -w -W -E -a $SRC -v $VAR $ROOT/usr env PATH="$PATH" /app/cd.sh "$@"
     rc=$?;
 elif test "x${LINUX_USER_CHROOT}" != "x"; then
-    $LINUX_USER_CHROOT --unshare-ipc --unshare-pid --unshare-net --mount-bind /dev /dev --mount-proc /proc 
--mount-bind $ROOT/usr /usr --mount-bind $VAR /var --mount-bind $SRC /self --chdir /self $CHROOT "$@"
+    $LINUX_USER_CHROOT --unshare-ipc --unshare-pid --unshare-net --mount-bind /dev /dev --mount-proc /proc 
--mount-bind $ROOT/usr /usr --mount-bind $VAR /var --mount-bind $SRC /app --chdir /app $CHROOT "$@"
     rc=$?;
 else
     echo "No containment helper found"
diff --git a/cd.sh b/cd.sh
index df6602b..94dee4b 100755
--- a/cd.sh
+++ b/cd.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-cd /self
+cd /app
 exec "$@"
diff --git a/packages/.rpmmacros b/packages/.rpmmacros
index f6fba10..1a65ae7 100644
--- a/packages/.rpmmacros
+++ b/packages/.rpmmacros
@@ -1,5 +1,5 @@
-%_topdir        /self/packages
-%_srcrpmdir     /self/packages/SRPMS
+%_topdir        /app/packages
+%_srcrpmdir     /app/packages/SRPMS
 %_buildrootdir         %{_topdir}/BUILDROOT
 %_builddir             %{_topdir}/BUILD_XXXXX
 
diff --git a/packages/SOURCES/fontconfig-xdg-app.conf b/packages/SOURCES/fontconfig-xdg-app.conf
index ef948ba..03c629d 100644
--- a/packages/SOURCES/fontconfig-xdg-app.conf
+++ b/packages/SOURCES/fontconfig-xdg-app.conf
@@ -3,10 +3,10 @@
 <fontconfig>
         <cachedir>/usr/cache/fontconfig</cachedir>
 
-        <dir>/self/share/fonts</dir>
-        <cachedir>/self/cache/fontconfig</cachedir>
+        <dir>/app/share/fonts</dir>
+        <cachedir>/app/cache/fontconfig</cachedir>
 
-        <include ignore_missing="yes">/self/etc/fonts/local.conf</include>
+        <include ignore_missing="yes">/app/etc/fonts/local.conf</include>
 
         <dir>/run/host/fonts</dir>
 </fontconfig>
diff --git a/packages/SOURCES/rpm-macros b/packages/SOURCES/rpm-macros
index c5cbfea..29ae63b 100644
--- a/packages/SOURCES/rpm-macros
+++ b/packages/SOURCES/rpm-macros
@@ -1,4 +1,4 @@
-%_prefix               /self
+%_prefix               /app
 %_exec_prefix           %{_prefix}
 %_bindir                %{_exec_prefix}/bin
 %_sbindir               %{_exec_prefix}/sbin
diff --git a/packages/SPECS/freedesktop-platform-base.spec b/packages/SPECS/freedesktop-platform-base.spec
index 31008ba..3cfb0ef 100644
--- a/packages/SPECS/freedesktop-platform-base.spec
+++ b/packages/SPECS/freedesktop-platform-base.spec
@@ -8,7 +8,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 
 # Yocto builds without the normal find-provides, we supply those provides in the gnome-platform-base package
-Provides: %(./find_prov.sh /self/freedesktop-platform/usr)
+Provides: %(./find_prov.sh /app/freedesktop-platform/usr)
 
 %if %{__isa_bits} == 64
 %define provides_suffix (64bit)
diff --git a/packages/SPECS/freedesktop-sdk.spec b/packages/SPECS/freedesktop-sdk.spec
index cdd3995..4e52793 100644
--- a/packages/SPECS/freedesktop-sdk.spec
+++ b/packages/SPECS/freedesktop-sdk.spec
@@ -86,12 +86,12 @@ Meta package for Gnome SDK dependencies
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
 install -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/debug
-ln -s /self/lib/debug $RPM_BUILD_ROOT%{_libdir}/debug/self
+ln -s /app/lib/debug $RPM_BUILD_ROOT%{_libdir}/debug/app
 
 %files
 %doc
 %{_sysconfdir}/rpm/macros
-%{_libdir}/debug/self
+%{_libdir}/debug/app
 
 %changelog
 * Fri Nov  7 2014 Alexander Larsson <alexl redhat com>
diff --git a/setup.sh b/setup.sh
index 84f885a..c3f8d11 100755
--- a/setup.sh
+++ b/setup.sh
@@ -5,5 +5,5 @@ mkdir -p packages/RPMS/x86_64
 
 ./setup_root.sh $1
 ./build.sh smart channel -y --add mydb type=rpm-sys name="RPM Database"
-./build.sh smart channel -y --add noarch type=rpm-dir name="RPM Database" path=/self/packages/RPMS/noarch
-./build.sh smart channel -y --add x86_64 type=rpm-dir name="RPM Database" path=/self/packages/RPMS/x86_64/
+./build.sh smart channel -y --add noarch type=rpm-dir name="RPM Database" path=/app/packages/RPMS/noarch
+./build.sh smart channel -y --add x86_64 type=rpm-dir name="RPM Database" path=/app/packages/RPMS/x86_64/
diff --git a/setup_root.sh b/setup_root.sh
index 3e4c26b..67b350a 100755
--- a/setup_root.sh
+++ b/setup_root.sh
@@ -15,7 +15,7 @@ IMAGE=`readlink -f $1`
 rm -rf $ROOT $VAR $CHROOT
 mkdir -p $ROOT $VAR $CHROOT
 
-mkdir -p $CHROOT/var $CHROOT/usr $CHROOT/tmp $CHROOT/self $CHROOT/proc $CHROOT/dev
+mkdir -p $CHROOT/var $CHROOT/usr $CHROOT/tmp $CHROOT/app $CHROOT/proc $CHROOT/dev
 ln -s usr/lib $CHROOT/lib
 ln -s usr/bin $CHROOT/bin
 ln -s usr/sbin $CHROOT/sbin
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]