[Lunar-commits] <lunar> Backport fix and cosmetic backports (spelling, gcc arch x86 optimizations). Full sync to theedge.
Auke Kok
sofar at lunar-linux.org
Mon Jul 2 04:43:08 CEST 2012
commit 656e6df7200da1720eab12e3282c00d6b22ffd34
Author: Auke Kok <sofar at lunar-linux.org>
Date: Thu Oct 13 20:23:04 2005 +0000
Backport fix and cosmetic backports (spelling, gcc arch x86 optimizations). Full sync to theedge.
---
bin/lvu | 2 +-
sbin/lget | 2 +-
sbin/lin | 4 +-
sbin/lrm | 2 +-
sbin/lunar | 2 +-
var/lib/lunar/compilers/ld | 8 ++
var/lib/lunar/functions/build.lunar | 29 +++++-
var/lib/lunar/functions/check.lunar | 2 +-
var/lib/lunar/functions/depends.lunar | 6 +-
var/lib/lunar/functions/download.lunar | 6 +-
var/lib/lunar/functions/kernel.lunar | 2 +-
var/lib/lunar/functions/main.lunar | 2 +-
var/lib/lunar/functions/optimize.lunar | 124 ++++++++++++------------
var/lib/lunar/functions/plugins.lunar | 2 +-
var/lib/lunar/functions/queue.lunar | 2 +-
var/lib/lunar/functions/recovery.lunar | 2 +-
var/lib/lunar/functions/uniqid.lunar | 2 +-
var/lib/lunar/plugins/postbuild-generic.plugin | 2 +-
18 files changed, 116 insertions(+), 85 deletions(-)
diff --git a/bin/lvu b/bin/lvu
index 3437ec3..43e1b46 100755
--- a/bin/lvu
+++ b/bin/lvu
@@ -784,7 +784,7 @@ submit_module() {
unset SECTION
fi
else
- message "Please don't edit modules outside of the 'zlocal' secion!"
+ message "Please don't edit modules outside of the 'zlocal' section!"
message "do this first: \`lvu edit \$MODULE ; lin moonbase\`"
message "so that module changes can be tracked properly!"
exit 1
diff --git a/sbin/lget b/sbin/lget
index d4f604e..2382fc3 100755
--- a/sbin/lget
+++ b/sbin/lget
@@ -64,7 +64,7 @@ main() {
if echo $MODULES | grep -qw moonbase ; then
# just update moonbase, no other modules
get_moonbase
- # remove moonbase rofm MODULES and continue
+ # remove moonbase from MODULES and continue
MODULES=$(echo $MODULES | sed 's/moonbase//g')
fi
diff --git a/sbin/lin b/sbin/lin
index 7a2f7b4..d41a2aa 100755
--- a/sbin/lin
+++ b/sbin/lin
@@ -27,7 +27,7 @@
############################################################
# This enables alias expansion within lin and its children
-# although this dosen't expand aliases within functions
+# although this doesn't expand aliases within functions
# That is a limitation of bash and aliases
shopt -s expand_aliases
@@ -67,7 +67,7 @@ main() {
if ! lget moonbase ; then
exit 1
fi
- # remove moonbase rofm MODULES and continue
+ # remove moonbase from MODULES and continue
MODULES=$(echo $MODULES | sed 's/moonbase//g')
if [ -z "$MODULES" ] ; then
return
diff --git a/sbin/lrm b/sbin/lrm
index e1d1e09..ff2b066 100755
--- a/sbin/lrm
+++ b/sbin/lrm
@@ -333,7 +333,7 @@ else
for MODULE in "${@#-}" ; do
if check_status "$MODULE" ; then
- # assemble pureg list if requested
+ # assemble purge list if requested
if [ "$PURGE" == "on" ] ; then
DEPS=$(list_installed_depending "$MODULE" | sort | uniq)
for DEP in $DEPS ; do
diff --git a/sbin/lunar b/sbin/lunar
index 9c119b6..202523d 100755
--- a/sbin/lunar
+++ b/sbin/lunar
@@ -747,7 +747,7 @@ main_menu() {
while
M_HELP="Easy module management"
O_HELP="Change lunar options and features"
- L_HELP="View and edit lunar genreated log files."
+ L_HELP="View and edit lunar generated log files."
Q_HELP="View and edit lunar queues."
F_HELP="Process queues while you watch and wait"
N_HELP="Discover and fix internal problems"
diff --git a/var/lib/lunar/compilers/ld b/var/lib/lunar/compilers/ld
new file mode 100644
index 0000000..bfe42ce
--- /dev/null
+++ b/var/lib/lunar/compilers/ld
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [ -n "$LUNAR_DEBUG" ] ; then
+ echo "++ ${LD_PATH:-/usr/bin}/ld \"$@\"" >&2
+fi
+
+${LD_PATH:-/usr/bin}/ld "$@"
+
diff --git a/var/lib/lunar/functions/build.lunar b/var/lib/lunar/functions/build.lunar
index 9096158..18c0d8f 100644
--- a/var/lib/lunar/functions/build.lunar
+++ b/var/lib/lunar/functions/build.lunar
@@ -135,7 +135,7 @@ default_pre_build() {
cd $SOURCE_DIRECTORY &&
make clean
if [ $? -ne 0 ]; then
- message "${PROBLEM_COLOR}ERROR: ${DEFAULT_COLOR}The source for ${MODULE_COLOR}$MODULE${DEFUALT_COLOR}: could not be made clean for build."
+ message "${PROBLEM_COLOR}ERROR: ${DEFAULT_COLOR}The source for ${MODULE_COLOR}$MODULE${DEFAULT_COLOR}: could not be made clean for build."
# Thoughts on forcing a new source directory?
# More of how should we handle this, currently we will bail out
# A vast majority of the moonbase will fail, (w/o: make clean)
@@ -165,6 +165,25 @@ default_config() {
} > $C_FIFO 2>&1
+default_game_config() {
+ debug_msg "default_game_config ($@)"
+ verbose_msg "running \"default_game_config\""
+ verbose_msg "CFLAGS=\"$CFLAGS\"" &&
+ verbose_msg "OPTS=\"$OPTS\"" &&
+ verbose_msg "./configure --build=$BUILD --prefix=$MODULE_PREFIX --bindir=$MODULE_PREFIX/games --datadir=$MODULE_PREFIX/share/games --sysconfdir=/etc --localstatedir=/var --infodir=$MODULE_PREFIX/share/info --mandir=$MODULE_PREFIX/share/man $OPTS"
+
+ ./configure --build=$BUILD \
+ --prefix=$MODULE_PREFIX \
+ --bindir=$MODULE_PREFIX/games \
+ --datadir=$MODULE_PREFIX/share/games \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --infodir=$MODULE_PREFIX/share/info \
+ --mandir=$MODULE_PREFIX/share/man \
+ $OPTS
+} > $C_FIFO 2>&1
+
+
default_cvs_config() {
debug_msg "default_cvs_config ($@)"
verbose_msg "running \"default_cvs_config\""
@@ -190,6 +209,12 @@ default_make() {
make install
} > $C_FIFO 2>&1
+default_game_build() {
+ debug_msg "default_game_build ($@)"
+ verbose_msg "running \"default_game_build\""
+ default_game_config &&
+ default_make
+} > $C_FIFO 2>&1
default_build() {
debug_msg "default_build ($@)"
@@ -293,7 +318,7 @@ run_configure() {
prepare_module_config
grep -q "^"$MODULE"\$" $TEMP_PREPAREDDEPS 2>/dev/null && return 0
- # add custom passed OPTS before retreiving them
+ # add custom passed OPTS before retrieving them
if [ -n "$PASS_OPTS" ] ; then
OPTS="$(get_module_config OPTS) $PASS_OPTS"
set_module_config OPTS "$OPTS"
diff --git a/var/lib/lunar/functions/check.lunar b/var/lib/lunar/functions/check.lunar
index 9c5ff6c..713185d 100644
--- a/var/lib/lunar/functions/check.lunar
+++ b/var/lib/lunar/functions/check.lunar
@@ -1,7 +1,7 @@
#!/bin/bash
############################################################
# #
-# check/lunar - module santy checking functions #
+# check/lunar - module sanity checking functions #
# #
############################################################
# #
diff --git a/var/lib/lunar/functions/depends.lunar b/var/lib/lunar/functions/depends.lunar
index a4f5833..49b688c 100644
--- a/var/lib/lunar/functions/depends.lunar
+++ b/var/lib/lunar/functions/depends.lunar
@@ -71,9 +71,7 @@ sort_by_dependency() {
# tsort the existing dep relations in all of moonbase
TMP_TSRT=$(temp_create "dependency.sort")
- for LINE in $(cat $DEPENDS_CACHE); do
- A=$(echo $LINE | cut -d: -f1)
- B=$(echo $LINE | cut -d: -f2)
+ cat $DEPENDS_CACHE | cut -d: -f1,2 --output-delimiter=" " | while read A B ; do
B=$(MODULE=$A NEVER_ASK=1 DEPS_ONLY= unalias $B)
echo "$A $B" >> $TMP_TSRT
done
@@ -106,7 +104,7 @@ is_depends() {
in_depends() {
debug_msg "in_depends ($@)"
- # Was $2 presented as a depenency for module $1
+ # Was $2 presented as a dependency for module $1
return $(grep -q "^$1:$2:on:" $DEPENDS_STATUS)
}
diff --git a/var/lib/lunar/functions/download.lunar b/var/lib/lunar/functions/download.lunar
index 93ca251..007c552 100644
--- a/var/lib/lunar/functions/download.lunar
+++ b/var/lib/lunar/functions/download.lunar
@@ -5,7 +5,7 @@
# #
############################################################
# #
-# Copyrigh Auke Kok / Lunar-Linux 2005 under GPLv2 #
+# Copyright Auke Kok / Lunar-Linux 2005 under GPLv2 #
# #
############################################################
@@ -64,7 +64,7 @@ download_module() {
eval SRC=\$$(echo SOURCE$N | sed s/SOURCE0/SOURCE/ )
eval URLS=\${$(echo SOURCE${N}_URL | sed s/SOURCE0/SOURCE/ )[@]}
- # continue (to next) if empty once, break if empty tiwce
+ # continue (to next) if empty once, break if empty twice
if [ -z "$SRC" ] ; then
if [ -z "$SECOND" ] ; then
SECOND="yes"
@@ -106,7 +106,7 @@ download_module() {
for URL in $URLS ; do
add_url $URL
if [ "$EXHAUSTIVE" == "on" ]; then
- # scan for hits agains known clusters of mirrors
+ # scan for hits against known clusters of mirrors
for MLIST in $MIRRORS/*; do
for ALT in $(sed 's/.*\t\([^\t]*\)$/\1/g' $MLIST | grep -v "^Custom$"); do
if [ "${URL:0:${#ALT}}" == "$ALT" ] ; then
diff --git a/var/lib/lunar/functions/kernel.lunar b/var/lib/lunar/functions/kernel.lunar
index fa4072c..f91acee 100644
--- a/var/lib/lunar/functions/kernel.lunar
+++ b/var/lib/lunar/functions/kernel.lunar
@@ -15,7 +15,7 @@
# Description : This function makes backups of the kernels and modules
-# Arg 1 : Filename of the kernel to backup (With or witout full path)
+# Arg 1 : Filename of the kernel to backup (With or without full path)
# With the format $VERSION_$EXTRAVERSION
backup_mods_krnl() {
debug_msg "backup_mods_krnl ($@)"
diff --git a/var/lib/lunar/functions/main.lunar b/var/lib/lunar/functions/main.lunar
index cc4cff9..b64cea8 100644
--- a/var/lib/lunar/functions/main.lunar
+++ b/var/lib/lunar/functions/main.lunar
@@ -51,7 +51,7 @@ renew() {
update() {
debug_msg "update ($@)"
if ps -C lin > /dev/null ; then
- error_message "${PROBLEM_COLOR}Unable to update lunar concurrently while installing.${DEFAILT_COLOR}"
+ error_message "${PROBLEM_COLOR}Unable to update lunar concurrently while installing.${DEFAULT_COLOR}"
return 1
fi
diff --git a/var/lib/lunar/functions/optimize.lunar b/var/lib/lunar/functions/optimize.lunar
index 27981bf..3d040bb 100644
--- a/var/lib/lunar/functions/optimize.lunar
+++ b/var/lib/lunar/functions/optimize.lunar
@@ -111,151 +111,151 @@ optimize_cpu() {
# Begin x86 options
case $1 in
- I386) CFLAGS="$CFLAGS -mcpu=i386 -march=i386"
- CXXFLAGS="$CXXFLAGS -mcpu=i386 -march=i386"
+ I386) CFLAGS="$CFLAGS -march=i386"
+ CXXFLAGS="$CXXFLAGS -march=i386"
BUILD="i386-pc-linux-gnu"
;;
- I486) CFLAGS="$CFLAGS -mcpu=i486 -march=i486"
- CXXFLAGS="$CXXFLAGS -mcpu=i486 -march=i486"
+ I486) CFLAGS="$CFLAGS -march=i486"
+ CXXFLAGS="$CXXFLAGS -march=i486"
BUILD="i486-pc-linux-gnu"
;;
- I586) CFLAGS="$CFLAGS -mcpu=i586 -march=i586"
- CXXFLAGS="$CXXFLAGS -mcpu=i586 -march=i586"
+ I586) CFLAGS="$CFLAGS -march=i586"
+ CXXFLAGS="$CXXFLAGS -march=i586"
BUILD="i586-pc-linux-gnu"
;;
- I686) CFLAGS="$CFLAGS -mcpu=i686 -march=i686"
- CXXFLAGS="$CXXFLAGS -mcpu=i686 -march=i686"
+ I686) CFLAGS="$CFLAGS -march=i686"
+ CXXFLAGS="$CXXFLAGS -march=i686"
BUILD="i686-pc-linux-gnu"
;;
- Pentium) CFLAGS="$CFLAGS -mcpu=pentium -march=pentium"
- CXXFLAGS="$CXXFLAGS -mcpu=pentium -march=pentium"
+ Pentium) CFLAGS="$CFLAGS -march=pentium"
+ CXXFLAGS="$CXXFLAGS -march=pentium"
BUILD="i586-pc-linux-gnu"
;;
- PentiumMMX) CFLAGS="$CFLAGS -mcpu=pentium-mmx -march=pentium-mmx"
- CXXFLAGS="$CXXFLAGS -mcpu=pentium-mmx -march=pentium-mmx"
+ PentiumMMX) CFLAGS="$CFLAGS -march=pentium-mmx"
+ CXXFLAGS="$CXXFLAGS -march=pentium-mmx"
BUILD="i586-pc-linux-gnu"
;;
- PentiumPro) CFLAGS="$CFLAGS -mcpu=pentiumpro -march=pentiumpro"
- CXXFLAGS="$CXXFLAGS -mcpu=pentiumpro -march=pentiumpro"
+ PentiumPro) CFLAGS="$CFLAGS -march=pentiumpro"
+ CXXFLAGS="$CXXFLAGS -march=pentiumpro"
BUILD="i686-pc-linux-gnu"
;;
Pentium2) if [[ $GCCVER == "3" ]]; then
- CFLAGS="$CFLAGS -mcpu=pentium2 -march=pentium2"
- CXXFLAGS="$CXXFLAGS -mcpu=pentium2 -march=pentium2"
+ CFLAGS="$CFLAGS -march=pentium2"
+ CXXFLAGS="$CXXFLAGS -march=pentium2"
BUILD="i686-pc-linux-gnu"
else
- CFLAGS="$CFLAGS -mcpu=i686 -march=i686"
- CXXFLAGS="$CXXFLAGS -mcpu=i686 -march=i686"
+ CFLAGS="$CFLAGS -march=i686"
+ CXXFLAGS="$CXXFLAGS -march=i686"
BUILD="i686-pc-linux-gnu"
fi
;;
Pentium3) if [[ $GCCVER == "3" ]]; then
- CFLAGS="$CFLAGS -mcpu=pentium3 -march=pentium3"
- CXXFLAGS="$CXXFLAGS -mcpu=pentium3 -march=pentium3"
+ CFLAGS="$CFLAGS -march=pentium3"
+ CXXFLAGS="$CXXFLAGS -march=pentium3"
BUILD="i686-pc-linux-gnu"
else
- CFLAGS="$CFLAGS -mcpu=i686 -march=i686"
- CXXFLAGS="$CXXFLAGS -mcpu=i686 -march=i686"
+ CFLAGS="$CFLAGS -march=i686"
+ CXXFLAGS="$CXXFLAGS -march=i686"
BUILD="i686-pc-linux-gnu"
fi
;;
Pentium4) if [[ $GCCVER == "3" ]]; then
- CFLAGS="$CFLAGS -mcpu=pentium4 -march=pentium4"
- CXXFLAGS="$CXXFLAGS -mcpu=pentium4 -march=pentium4"
+ CFLAGS="$CFLAGS -march=pentium4"
+ CXXFLAGS="$CXXFLAGS -march=pentium4"
BUILD="i686-pc-linux-gnu"
else
- CFLAGS="$CFLAGS -mcpu=i686 -march=i686"
- CXXFLAGS="$CXXFLAGS -mcpu=i686 -march=i686"
+ CFLAGS="$CFLAGS -march=i686"
+ CXXFLAGS="$CXXFLAGS -march=i686"
BUILD="i686-pc-linux-gnu"
fi
;;
K6) if [[ $GCCVER == "3" ]]; then
- CFLAGS="$CFLAGS -mcpu=k6 -march=k6"
- CXXFLAGS="$CXXFLAGS -mcpu=k6 -march=k6"
+ CFLAGS="$CFLAGS -march=k6"
+ CXXFLAGS="$CXXFLAGS -march=k6"
BUILD="i586-pc-linux-gnu"
else
- CFLAGS="$CFLAGS -mcpu=i586 -march=i586"
- CXXFLAGS="$CXXFLAGS -mcpu=k6 -march=k6"
+ CFLAGS="$CFLAGS -march=i586"
+ CXXFLAGS="$CXXFLAGS -march=k6"
BUILD="i586-pc-linux-gnu"
fi
;;
K62) if [[ $GCCVER == "3" ]]; then
- CFLAGS="$CFLAGS -mcpu=k6-2 -march=k6-2"
- CXXFLAGS="$CXXFLAGS -mcpu=k6-2 -march=k6-2"
+ CFLAGS="$CFLAGS -march=k6-2"
+ CXXFLAGS="$CXXFLAGS -march=k6-2"
BUILD="i586-pc-linux-gnu"
else
- CFLAGS="$CFLAGS -mcpu=i686 -march=i586"
- CXXFLAGS="$CXXFLAGS -mcpu=i686 -march=i586"
+ CFLAGS="$CFLAGS -march=i586"
+ CXXFLAGS="$CXXFLAGS -march=i586"
BUILD="i586-pc-linux-gnu"
fi
;;
K63) if [[ $GCCVER == "3" ]]; then
- CFLAGS="$CFLAGS -mcpu=k6-3 -march=k6-3"
- CXXFLAGS="$CXXFLAGS -mcpu=k6-3 -march=k6-3"
+ CFLAGS="$CFLAGS -march=k6-3"
+ CXXFLAGS="$CXXFLAGS -march=k6-3"
BUILD="i586-pc-linux-gnu"
else
- CFLAGS="$CFLAGS -mcpu=i686 -march=i586"
- CXXFLAGS="$CXXFLAGS -mcpu=i686 -march=i586"
+ CFLAGS="$CFLAGS -march=i586"
+ CXXFLAGS="$CXXFLAGS -march=i586"
BUILD="i586-pc-linux-gnu"
fi
;;
Athlon) if [[ $GCCVER == "3" ]]; then
- CFLAGS="$CFLAGS -mcpu=athlon -march=athlon"
- CXXFLAGS="$CXXFLAGS -mcpu=athlon -march=athlon"
+ CFLAGS="$CFLAGS -march=athlon"
+ CXXFLAGS="$CXXFLAGS -march=athlon"
BUILD="i686-pc-linux-gnu"
else
- CFLAGS="$CFLAGS -mcpu=i686 -march=i686"
- CXXFLAGS="$CXXFLAGS -mcpu=i686 -march=i686"
+ CFLAGS="$CFLAGS -march=i686"
+ CXXFLAGS="$CXXFLAGS -march=i686"
BUILD="i686-pc-linux-gnu"
fi
;;
AthlonTBird) if [[ $GCCVER == "3" ]]; then
- CFLAGS="$CFLAGS -mcpu=athlon-tbird -march=athlon-tbird"
- CXXFLAGS="$CXXFLAGS -mcpu=athlon-tbird -march=athlon-tbird"
+ CFLAGS="$CFLAGS -march=athlon-tbird"
+ CXXFLAGS="$CXXFLAGS -march=athlon-tbird"
BUILD="i686-pc-linux-gnu"
else
- CFLAGS="$CFLAGS -mcpu=i686 -march=i686"
- CXXFLAGS="$CXXFLAGS -mcpu=i686 -march=i686"
+ CFLAGS="$CFLAGS -march=i686"
+ CXXFLAGS="$CXXFLAGS -march=i686"
BUILD="i686-pc-linux-gnu"
fi
;;
Athlon4) if [[ $GCCVER == "3" ]]; then
- CFLAGS="$CFLAGS -mcpu=athlon-4 -march=athlon-4"
- CXXFLAGS="$CXXFLAGS -mcpu=athlon-4 -march=athlon-4"
+ CFLAGS="$CFLAGS -march=athlon-4"
+ CXXFLAGS="$CXXFLAGS -march=athlon-4"
BUILD="i686-pc-linux-gnu"
else
- CFLAGS="$CFLAGS -mcpu=i686 -march=i686"
- CXXFLAGS="$CXXFLAGS -mcpu=i686 -march=i686"
+ CFLAGS="$CFLAGS -march=i686"
+ CXXFLAGS="$CXXFLAGS -march=i686"
BUILD="i686-pc-linux-gnu"
fi
;;
AthlonXP) if [[ $GCCVER == "3" ]]; then
- CFLAGS="$CFLAGS -mcpu=athlon-xp -march=athlon-xp"
- CXXFLAGS="$CXXFLAGS -mcpu=athlon-xp -march=athlon-xp"
+ CFLAGS="$CFLAGS -march=athlon-xp"
+ CXXFLAGS="$CXXFLAGS -march=athlon-xp"
BUILD="i686-pc-linux-gnu"
else
- CFLAGS="$CFLAGS -mcpu=i686 -march=i686"
- CXXFLAGS="$CXXFLAGS -mcpu=i686 -march=i686"
+ CFLAGS="$CFLAGS -march=i686"
+ CXXFLAGS="$CXXFLAGS -march=i686"
BUILD="i686-pc-linux-gnu"
fi
;;
AthlonMP) if [[ $GCCVER == "3" ]]; then
- CFLAGS="$CFLAGS -mcpu=athlon-mp -march=athlon-mp"
- CXXFLAGS="$CXXFLAGS -mcpu=athlon-mp -march=athlon-mp"
+ CFLAGS="$CFLAGS -march=athlon-mp"
+ CXXFLAGS="$CXXFLAGS -march=athlon-mp"
BUILD="i686-pc-linux-gnu"
else
- CFLAGS="$CFLAGS -mcpu=i686 -march=i686"
- CXXFLAGS="$CXXFLAGS -mcpu=i686 -march=i686"
+ CFLAGS="$CFLAGS -march=i686"
+ CXXFLAGS="$CXXFLAGS -march=i686"
BUILD="i686-pc-linux-gnu"
fi
;;
Athlon64) if [[ $GCCVER == "3" ]]; then
- CFLAGS="$CFLAGS -mcpu=athlon64 -march=athlon64"
- CXXFLAGS="$CXXFLAGS -mcpu=athlon64 -march=athlon64"
+ CFLAGS="$CFLAGS -march=athlon64"
+ CXXFLAGS="$CXXFLAGS -march=athlon64"
BUILD="i686-pc-linux-gnu"
else
- CFLAGS="$CFLAGS -mcpu=i686 -march=i686"
- CXXFLAGS="$CXXFLAGS -mcpu=i686 -march=i686"
+ CFLAGS="$CFLAGS -march=i686"
+ CXXFLAGS="$CXXFLAGS -march=i686"
BUILD="i686-pc-linux-gnu"
fi
;;
diff --git a/var/lib/lunar/functions/plugins.lunar b/var/lib/lunar/functions/plugins.lunar
index 20ced3c..821e943 100644
--- a/var/lib/lunar/functions/plugins.lunar
+++ b/var/lib/lunar/functions/plugins.lunar
@@ -25,7 +25,7 @@ plugin_register() {
# Defined plugin types:
# 1 - SOURCE_DOWNLOAD download some source code
# 2 - SOURCE_NEEDREFRESH source exists but needs refresh
- # 3 - SOURCE_VERIFY perform intergity verification on a file
+ # 3 - SOURCE_VERIFY perform integrity verification on a file
# 4 - SOURCE_UNPACK unpack a certain file to $(PWD)
# 5 - MODULE_CHECK integrity checking on installed modules
# 6 - KERNEL_UPDATEBOOTLOADER automate bootloader maintenance
diff --git a/var/lib/lunar/functions/queue.lunar b/var/lib/lunar/functions/queue.lunar
index 5f2b4f3..294ff18 100644
--- a/var/lib/lunar/functions/queue.lunar
+++ b/var/lib/lunar/functions/queue.lunar
@@ -16,7 +16,7 @@
# #
############################################################
-# Definiton:
+# Definition:
# a queue is a multielement data structure from which elements
# can be removed only in the same order in which they are inserted;
# that is, it follows a FIFO constraint.
diff --git a/var/lib/lunar/functions/recovery.lunar b/var/lib/lunar/functions/recovery.lunar
index 9a9f961..9e20796 100644
--- a/var/lib/lunar/functions/recovery.lunar
+++ b/var/lib/lunar/functions/recovery.lunar
@@ -112,7 +112,7 @@ check_status_files() {
"${MODULE_COLOR}$MODULE_STATUS_BACKUP" \
"${DEFAULT_COLOR}"
if `cp $MODULE_STATUS $MODULE_STATUS_BACKUP`; then
- message "${MESSAGE_COLOR}MODULE_STATUS is succesfully copied" \
+ message "${MESSAGE_COLOR}MODULE_STATUS is successfully copied" \
"to MODULE_STATUS_BACKUP" \
"${DEFAULT_COLOR}"
else
diff --git a/var/lib/lunar/functions/uniqid.lunar b/var/lib/lunar/functions/uniqid.lunar
index 596a935..45dc0fa 100644
--- a/var/lib/lunar/functions/uniqid.lunar
+++ b/var/lib/lunar/functions/uniqid.lunar
@@ -1,6 +1,6 @@
#!/bin/bash
# #
-# uniqid.lunar - Make a uniqe id for tracking clients #
+# uniqid.lunar - Make a unique id for tracking clients #
# #
############################################################
# #
diff --git a/var/lib/lunar/plugins/postbuild-generic.plugin b/var/lib/lunar/plugins/postbuild-generic.plugin
index 27a1536..468b4a7 100644
--- a/var/lib/lunar/plugins/postbuild-generic.plugin
+++ b/var/lib/lunar/plugins/postbuild-generic.plugin
@@ -105,7 +105,7 @@ plugin_archive_module()
if [ ! -e /var/state/lunar/module_history ]; then
mkdir -p /var/state/lunar/module_history
fi
- tar -cj -C $MOONBASE/$SECTION -f /var/state/lunar/module_history/$MODULE-$VERSION-$(date -u +%Y%m%d).tar.bz2 $MODULE
+ tar -cj --exclude=.svn -C $MOONBASE/$SECTION -f /var/state/lunar/module_history/$MODULE-$VERSION-$(date -u +%Y%m%d).tar.bz2 $MODULE
return 2
}
More information about the Lunar-commits
mailing list