From 931f42155c9ed05e03dc68a9316080b465d341d1 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Mon, 11 Oct 2010 00:47:51 +0200 Subject: [PATCH] overlay: automatized application of pkgs/$pkg/ overlay dir, and patches/$pkg.patch --- parse-config | 24 ++++++++++++++++++++++++ pkg_util-vserver.conf | 6 +----- 2 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 parse-config diff --git a/parse-config b/parse-config new file mode 100644 index 0000000..691051c --- /dev/null +++ b/parse-config @@ -0,0 +1,24 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: target/sheba/parse-config +# Copyright (C) 2010 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. A copy of the +# GNU General Public License can be found in the file COPYING. +# --- SDE-COPYRIGHT-NOTE-END --- + +shebadir="$base/target/${SDECFG_TRG_SHEBA:-sheba}" +x="$shebadir/pkgs/$pkg" +if [ -d "$x/" ]; then + var_append mnemosyne_overlay ' ' "$x" +fi +x="$shebadir/patches/$pkg.patch" +if [ -s "$x" ]; then + var_append patchfiles ' ' "$x" +fi +unset shebadir x diff --git a/pkg_util-vserver.conf b/pkg_util-vserver.conf index 5460690..58cc7c2 100644 --- a/pkg_util-vserver.conf +++ b/pkg_util-vserver.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: target/sheba/pkg_util-vserver.conf -# Copyright (C) 2007 - 2008 The OpenSDE Project +# Copyright (C) 2007 - 2010 The OpenSDE Project # Copyright (C) 2004 - 2006 Alejandro Mery # # More information can be found in the files COPYING and README. @@ -21,8 +21,6 @@ sheba_util_vserver_populate() local devdir="$root$sysconfdir/vservers/.defaults/dev" local node= - overlay_apply "$base/target/$target/pkgs/$pkg" - mkdir -p "$devdir" "$udevconfdir/create_nodes.sh" "$devdir" < $root$docdir/nodes.txt | while read node; do @@ -30,5 +28,3 @@ sheba_util_vserver_populate() done } hook_add postmake 5 "sheba_util_vserver_populate" - -var_append patchfiles ' ' $base/target/$target/patches/$pkg.patch