]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
Renamed variables of pkg_info() because of a namespace conflict.
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 15 Mar 2009 15:39:13 +0000 (16:39 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 15 Mar 2009 15:39:13 +0000 (16:39 +0100)
lfs/Config
tools/make-include
tools/make-interactive
tools/make-packages
tools/make-rootfiles

index ad9073269825b7de5e98772582ff9366def1e6e9..cf098471defd344927425f5e7b6d0e604ebce264 100644 (file)
@@ -90,19 +90,19 @@ PYTHON_COMPILE = find /usr/lib/python*/ -name *.py | xargs /usr/bin/py-compile
 
 define DO_PKG_INFO
        @## ALPHABETICAL ORDER ##
-       @echo "local DEBUG=\"$(DEBUG)\""
-       @echo "local DEPS=\"$(DEPS)\""
-       @echo "local DESC=\"$(value LONG_DESC)\""
-       @echo "local EXTRA=\"$(EXTRA)\""
-       @echo "local FILES=\"$(objects)\""
-       @echo "local GROUP=\"$(GROUP)\""
-       @echo "local LICENSE=\"$(LICENSE)\""
-       @echo "local MAINTAINER=\"$(MAINTAINER)\""
-       @echo "local NAME=\"$(PKG_NAME)\""
-       @echo "local VERSION=\"$(PKG_VER)\""
-       @echo "local RELEASE=\"$(PKG_REL)\""
-       @echo "local SHORT=\"$(value SHORT_DESC)\""
-       @echo "local URL=\"$(URL)\""
+       @echo "local PKG_DEBUG=\"$(DEBUG)\""
+       @echo "local PKG_DEPS=\"$(DEPS)\""
+       @echo "local PKG_DESC=\"$(value LONG_DESC)\""
+       @echo "local PKG_EXTRA=\"$(EXTRA)\""
+       @echo "local PKG_FILES=\"$(objects)\""
+       @echo "local PKG_GROUP=\"$(GROUP)\""
+       @echo "local PKG_LICENSE=\"$(LICENSE)\""
+       @echo "local PKG_MAINTAINER=\"$(MAINTAINER)\""
+       @echo "local PKG_NAME=\"$(PKG_NAME)\""
+       @echo "local PKG_VER=\"$(PKG_VER)\""
+       @echo "local PKG_REL=\"$(PKG_REL)\""
+       @echo "local PKG_SHORT=\"$(value SHORT_DESC)\""
+       @echo "local PKG_URL=\"$(URL)\""
 endef
 
 define DO_PACKAGE
index 2c2c7a56844e8eb99bf9e97cb4a9acf1fc635fe1..cb00d3b349a0fa2592c4a897d8ec71350b998398 100644 (file)
@@ -177,14 +177,14 @@ lfsmakecommoncheck()
        
        shift 1
 
-       build_spy package $NAME
+       build_spy package $PKG_NAME
 
-       beautify package "$NAME" "$VERSION" "$*"
+       beautify package "$PKG_NAME" "$PKG_VER" "$*"
 
        # Script slipped?
        local i
        for i in $SKIP_PACKAGE_LIST; do
-               if [ "$i" == "$NAME" ]; then
+               if [ "$i" == "$PKG_NAME" ]; then
                        beautify result SKIP
                        return 1
                fi
@@ -192,26 +192,26 @@ lfsmakecommoncheck()
 
        # On debug build, we don't strip
        if [ "$STAGE" != "toolchain" -a \
-                       "$NAME" == "strip" -a "$BUILD_DEBUG" == "1" ]; then
+                       "$PKG_NAME" == "strip" -a "$BUILD_DEBUG" == "1" ]; then
                beautify result SKIP
                return 1
        fi
 
        # Don't create addons?
-       if [ "$EXTRA" == "yes" ] && [ "$BUILD_EXTRAS" == "0" ]; then
+       if [ "$PKG_EXTRA" == "yes" ] && [ "$BUILD_EXTRAS" == "0" ]; then
                        beautify result SKIP
                        return 1
        fi
 
        # Don't create debugging tools?
-       if [ "$DEBUG" == "yes" ] && [ "$BUILD_DEBUG" == "0" ]; then
+       if [ "$PKG_DEBUG" == "yes" ] && [ "$BUILD_DEBUG" == "0" ]; then
                        beautify result SKIP
                        return 1
        fi
 
        # Searching for dependencies
        local found message
-       for dep in ${DEPS}; do
+       for dep in $PKG_DEPS; do
                found=0
                for package in $PACKAGES_DONE; do
                        if [ "$dep" = "$package" ]; then
@@ -223,7 +223,7 @@ lfsmakecommoncheck()
        done
        if [ "$message" != "" ]; then
                message="Deps are missing: $message"
-               if [ "$EXTRA" = "yes" ]; then
+               if [ "$PKG_EXTRA" = "yes" ]; then
                        echo -ne "${WARN}${message}${NORMAL}"
                        beautify message SKIP
                        return 1
index af1b855a61ffaa38b10502bea391827f389ea8d2..bb13cf18307d9b5124e0b00d3a02fd886b61b903 100644 (file)
@@ -282,44 +282,7 @@ package*|pkg)
                        ;;
                info)
                        shift 2
-                       format_desc() {
-                               MAX_LENGTH=38
-                               INPUT=$@
-
-                               LINE=""
-                               LENGTH=0
-                               for word in $INPUT; do
-                                       LENGTH=$(expr $LENGTH + ${#word})
-                                       if [ "$LENGTH" -ge "$MAX_LENGTH" ]; then
-                                               printf "$LINE\n"
-                                               LINE="              ${word} "
-                                               LENGTH=${#word}
-                                       else
-                                               LINE="$LINE${word} "
-                                       fi
-                                       #echo "-- ($word) $LINE"
-                               done
-                               printf "$LINE\n"
-                       }
-                       for pkg in $@; do
-                               (
-                                       eval "$(pkg_info ${pkg})"
-                                       echo    "############################################################"
-                                       echo -e "# ${CLR_BOLD_RED}PACKAGE INFO${NORMAL}"
-                                       echo    "############################################################"
-                                       for val in NAME VERSION RELEASE break GROUP MAINTAINER break URL LICENSE; do
-                                               if [ "${val}" == "break" ]; then
-                                                       echo "         ----------------------------------------         "
-                                               else
-                                                       printf "${CLR_BOLD_RED}%-12s${NORMAL}: ${!val}\n" ${val}
-                                               fi
-                                       done
-                                       for val in SHORT DESC; do
-                                               printf "${CLR_BOLD_RED}%-12s${NORMAL}: " ${val}
-                                               format_desc ${!val}
-                                       done
-                                       )
-                       done
+                       pkg_info_shell $@
                        ;;
                group*)
                        echo "#### All available groups of packages in ${NAME}-${VERSION} ####"
index 68dfde026eef248c2d39435d7a668afaf08aa10f..8af06d5a9bf57406738c485b4cbe49290e27f926 100644 (file)
@@ -32,11 +32,10 @@ pkg_list_groups_wiki() {
        for group in $(pkg_list_groups); do
                echo "===== $group ====="
                for package in $BASEDIR/lfs/*; do
-                       (       unset NAME VERSION
-                               eval $(pkg_info ${package})
-                               if [ -n "$NAME" ] && [ "$RELEASE" != "-1" ] && [ "$GROUP" = "$group" ]; then
-                                       [ -n "$VERSION" ] && NAME="${NAME}-${VERSION}"
-                                       echo "  * [[.:package:$(basename $package)|${NAME}]] - ${SHORT}"
+                       (       eval $(pkg_info ${package})
+                               if [ -n "$PKG_NAME" ] && [ "$PKG_REL" != "-1" ] && [ "$PKG_GROUP" = "$group" ]; then
+                                       [ -n "$PKG_VERSION" ] && NAME="${PKG_NAME}-${PKG_VERSION}"
+                                       echo "  * [[.:package:$(basename $package)|${PKG_NAME}]] - ${PKG_SHORT}"
                                fi
                        )
                done
@@ -49,11 +48,10 @@ pkg_list_packages() {
        for i in $BASEDIR/lfs/*; do
                [ -L "$i" ] && continue
                package=$(basename $i)
-               (       unset NAME VERSION
-                       eval $(pkg_info ${package})
-                       if [ -n "$NAME" ] && [ "$RELEASE" != "-1" ]; then
-                               printf "  * %-30s" ${NAME}-${VERSION}
-                               echo "${SHORT}"
+               (       eval $(pkg_info ${package})
+                       if [ -n "$PKG_NAME" ] && [ "$PKG_REL" != "-1" ]; then
+                               printf "  * %-30s" ${PKG_NAME}-${PKG_VER}
+                               echo "${PKG_SHORT}"
                        fi
                )
        done
@@ -65,11 +63,10 @@ pkg_list_packages_wiki() {
        for i in $BASEDIR/lfs/*; do
                [ -L "$i" ] && continue
                package=$(basename $i)
-               (       unset NAME VERSION
-                       eval $(pkg_info ${package})
-                       if [ -n "$NAME" ] && [ "$RELEASE" != "-1" ]; then
-                               [ -n "$VERSION" ] && NAME="${NAME}-${VERSION}"
-                               echo "  * [[.:package:$package|${NAME}]] - ${SHORT}"
+               (       eval $(pkg_info ${package})
+                       if [ -n "$PKG_NAME" ] && [ "$PKG_REL" != "-1" ]; then
+                               [ -n "$PKG_VER" ] && PKG_NAME="${PKG_NAME}-${PKG_VERSION}"
+                               echo "  * [[.:package:$package|${PKG_NAME}]] - ${PKG_SHORT}"
                        fi
                )
        done
@@ -96,26 +93,24 @@ pkg_info() {
 }
 
 pkg_info_wiki() {
-       (
-               unset NAME VERSION
-               eval $(pkg_info ${1})
+       (       eval $(pkg_info ${1})
 
-               [ "$NAME" = "" ] && exit
+               [ "$PKG_NAME" = "" ] && exit
 
                # Output everything in wiki format
-               echo "^  $NAME  ^^"
-               echo "| Version:  | $VERSION  |"
-               echo "| Release:  | $RELEASE  |"
-               echo "| Group:  | $GROUP  |"
-               echo "| License:  | $LICENSE  |"
-               echo "| Maintainer:  | $MAINTAINER  |"
-               echo "| Dependencies: | $(for dep in $DEPS; do echo \"[[$dep]]\"; done) |"
-               echo "| $(echo $DESC) ||"
-               echo "| Website:  | $URL  |"
-               if [ "$DEBUG" = "yes" ]; then
+               echo "^  $PKG_NAME  ^^"
+               echo "| Version:  | $PKG_VER  |"
+               echo "| Release:  | $PKG_REL  |"
+               echo "| Group:  | $PKG_GROUP  |"
+               echo "| License:  | $PKG_LICENSE  |"
+               echo "| Maintainer:  | $PKG_MAINTAINER  |"
+               echo "| Dependencies: | $(for dep in $PKG_DEPS; do echo \"[[$dep]]\"; done) |"
+               echo "| $(echo $PKG_DESC) ||"
+               echo "| Website:  | $PKG_URL  |"
+               if [ "$PKG_DEBUG" = "yes" ]; then
                        echo "<color red>This is a debug-package.</color>"
                fi
-               if [ "$EXTRA" = "yes" ]; then
+               if [ "$PKG_EXTRA" = "yes" ]; then
                        echo "<color green>This is an extra package.</color>"
                fi
                echo
@@ -127,18 +122,57 @@ pkg_info_wiki() {
 
 pkg_deps() {
        (
-               unset NAME VERSION
                eval $(pkg_info ${1})
-               echo $DEPS
+               echo $PKG_DEPS
        )
 }
 
 pkg_files() {
        (
-               unset NAME VERSION
                eval $(pkg_info ${1})
-               for i in $FILES; do
+               for i in $PKG_FILES; do
                        echo $i
                done
        )
 }
+
+function pkg_info_shell() {
+       format_desc() {
+               MAX_LENGTH=38
+               INPUT=$@
+
+               LINE=""
+               LENGTH=0
+               for word in $INPUT; do
+                       LENGTH=$(expr $LENGTH + ${#word})
+                       if [ "$LENGTH" -ge "$MAX_LENGTH" ]; then
+                               printf "$LINE\n"
+                               LINE="              ${word} "
+                               LENGTH=${#word}
+                       else
+                               LINE="$LINE${word} "
+                       fi
+                       #echo "-- ($word) $LINE"
+               done
+               printf "$LINE\n"
+       }
+       for pkg in $@; do
+               (
+                       eval "$(pkg_info ${pkg})"
+                       echo    "############################################################"
+                       echo -e "# ${CLR_BOLD_RED}PACKAGE INFO${NORMAL}"
+                       echo    "############################################################"
+                       for val in PKG_NAME PKG_VER PKG_REL break PKG_GROUP PKG_MAINTAINER break PKG_URL PKG_LICENSE; do
+                               if [ "${val}" == "break" ]; then
+                                       echo "         ----------------------------------------         "
+                               else
+                                       printf "${CLR_BOLD_RED}%-12s${NORMAL}: ${!val}\n" ${val#PKG_}
+                               fi
+                       done
+                       for val in PKG_SHORT PKG_DESC; do
+                               printf "${CLR_BOLD_RED}%-12s${NORMAL}: " ${val#PKG_}
+                               format_desc ${!val}
+                       done
+                       )
+       done
+}
index 4be1596e71fc3c77e6ba7105b8a745c7705b6312..b48d3f89820b43d8fbbf7511ef4e4c8cef38ecca 100644 (file)
@@ -86,15 +86,14 @@ rootfiles_commit() {
 
 rootfiles_copy() {
        for i in $@; do
-               (       unset NAME VERSION
-                       ROOTFILE=$(rootfiles_findone $i)
+               (       ROOTFILE=$(rootfiles_findone $i)
                        if [ "$ROOTFILE" = "" ]; then
                                dialogerror "Rootfile of \"$i\" not found. Create it first."
                                return 1
                        fi
                        eval $(pkg_info $i)
-                       for j in $NAME{-$VERSION,} \
-                               $(sed 's/\([a-z]\)\([a-zA-Z0-9]*\)/\u\1\2/g' <<< $NAME){,$VERSION}; do
+                       for j in $PKG_NAME{-$PKG_VER,} \
+                               $(sed 's/\([a-z]\)\([a-zA-Z0-9]*\)/\u\1\2/g' <<< $PKG_NAME){,$PKG_VER}; do
                                LOGFILE=$(find $BASEDIR/log_$TARGET/ -type f -name $j ! -name *_old)
                                [ -n "$LOGFILE" ] && break
                        done