mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-15 03:53:32 +01:00
make, scripts, tmpl/tex: Merge changes from V_1_2_1_7_NEUHAUS
This commit is contained in:
Jan Lindemann
parent
5fd32d8fbd
commit
80095a0f93
11 changed files with 102 additions and 21 deletions
12
make/dirs.mk
12
make/dirs.mk
|
|
@ -4,6 +4,11 @@
|
|||
# $Id$
|
||||
|
||||
.NOTPARALLEL:
|
||||
.PHONY: $(SUBDIRS_TO_ITERATE) all install clean distclean test
|
||||
|
||||
ifneq ($(FORCE_REBUILD_SUBDIRS),)
|
||||
.PHONY: dirs-all.done
|
||||
endif
|
||||
|
||||
include $(MODDIR)/make/defs.mk
|
||||
|
||||
|
|
@ -28,12 +33,15 @@ install: dirs-install.done
|
|||
clean: dirs.clean
|
||||
distclean: dirs.clean dirs.distclean
|
||||
|
||||
.PHONY: $(SUBDIRS_TO_ITERATE) all install clean distclean test
|
||||
|
||||
%/dirs-all.done:
|
||||
@echo $@ needs to be rebuilt
|
||||
exit 1
|
||||
|
||||
# explicit duplication of pattern-rule is needed, otherwise .PHONY: dirs-all.done won't match
|
||||
dirs-all.done:
|
||||
set -e; for d in $(SUBDIRS) ; do make -wC $$d $*; done
|
||||
touch $@
|
||||
|
||||
dirs-%.done:
|
||||
set -e; for d in $(SUBDIRS) ; do make -wC $$d $*; done
|
||||
touch $@
|
||||
|
|
|
|||
|
|
@ -82,3 +82,13 @@ do-install-links:
|
|||
sudo ln -sf $$cwd/$$f; \
|
||||
}; \
|
||||
done; \
|
||||
|
||||
git-init:
|
||||
@if [ -e .git ]; then \
|
||||
echo $(TOPDIR)/.git exists, aborting ;\
|
||||
exit 1 ;\
|
||||
fi
|
||||
git init
|
||||
list-cvs-files.sh -f | xargs git add
|
||||
git commit -m "initial checkin of $(RPM_VERSION)"
|
||||
|
||||
|
|
|
|||
|
|
@ -5,17 +5,23 @@
|
|||
arch=`uname -m`
|
||||
o_name=suse-11.4
|
||||
cmd=install
|
||||
initrd_modules="aufs via-rhine e1000 e1000e myri10ge forcedeth usbcore ohci-hcd ehci-hcd uhci-hcd hid usbhid ahci"
|
||||
initrd_modules="aufs via-rhine e1000 e1000e myri10ge forcedeth usbcore ohci-hcd ehci-hcd uhci-hcd hid usbhid ahci sata_nv"
|
||||
# ata_piix (as opposed to ahci) doesn't seem to support sata-hotplugging
|
||||
#kernel_version=2.6.37.4
|
||||
|
||||
kernel_version=2.6.37.6-jng135-default
|
||||
rpm_kernel_version=2.6.37.6~jng135-4
|
||||
kernel_flavour=-default
|
||||
|
||||
kernel_version=3.2.0
|
||||
rpm_kernel_version=3.2.0-1
|
||||
kernel_flavour=
|
||||
|
||||
umask 0022
|
||||
|
||||
unused_pkgs="
|
||||
sysvinit-systemd
|
||||
kernel
|
||||
kernel-default-$rpm_kernel_version
|
||||
kernel-syms-$rpm_kernel_version
|
||||
kernel-source-$rpm_kernel_version
|
||||
aufs-kmp
|
||||
|
|
@ -23,10 +29,10 @@ unused_pkgs="
|
|||
|
||||
# -- pciutils
|
||||
# used by jux, should be done by grepping /proc-files
|
||||
# aufs-kmp-default
|
||||
special_pkgs="
|
||||
aufs
|
||||
aufs-kmp-default
|
||||
kernel-default-$rpm_kernel_version
|
||||
kernel$kernel_flavour-$rpm_kernel_version
|
||||
rpm
|
||||
"
|
||||
|
||||
|
|
@ -37,12 +43,14 @@ special_pkgs="
|
|||
payload_pkgs="
|
||||
|
||||
kernel
|
||||
aufs
|
||||
memtest86+
|
||||
mkinitrd
|
||||
sysvinit
|
||||
grub
|
||||
syslinux
|
||||
splashy
|
||||
mailx
|
||||
ppp
|
||||
|
||||
kbd
|
||||
sensors
|
||||
|
|
@ -378,9 +386,9 @@ EOT
|
|||
zypper_repos_payload()
|
||||
{
|
||||
_cat << EOT | grep -v "^ *#"
|
||||
|#ftp.jannet.de ftp://dspadm:dspasswd@ftp.jannet.de/pub/packages/linux/suse/11.4/inst-source
|
||||
|ftp.jannet.de ftp://dspadm:dspasswd@ftp/pub/mirror/jannet/ftp/pub/packages/linux/suse/11.4/inst-source
|
||||
|ftp.priv.lcl ftp://dspadm:dspasswd@ftp/pub/local/packages/suse/11.4
|
||||
|#ftp.jannet.de ftp://dspdev:123qweasd@ftp.jannet.de/pub/packages/linux/suse/11.4/inst-source
|
||||
|ftp.jannet.de ftp://dspdev:123qweasd@ftp/pub/mirror/jannet/ftp/pub/packages/linux/suse/11.4/inst-source
|
||||
|ftp.priv.lcl ftp://dspdev:123qweasd@ftp/pub/local/packages/suse/11.4
|
||||
EOT
|
||||
}
|
||||
|
||||
|
|
@ -664,6 +672,7 @@ setup_boot_loader_net()
|
|||
# -s "853x480" is illegal in newer mkinitrd (as of SuSE 11.4)
|
||||
|
||||
(cd $root/boot; ln -sf initrd-netboot-$kernel_version initrd-netboot)
|
||||
(cd $root/boot; ln -sf memtest.bin memtest)
|
||||
}
|
||||
|
||||
undo_rpmnew()
|
||||
|
|
@ -770,6 +779,7 @@ cmd_install()
|
|||
setup_root_directory
|
||||
setup_bind_mounts
|
||||
|
||||
|
||||
mkdir -p -m 755 $root/etc
|
||||
mkdir -p -m 755 $root/etc/openldap
|
||||
for c in \
|
||||
|
|
@ -804,18 +814,23 @@ cmd_install()
|
|||
make_etc_issue > $root/etc/issue
|
||||
make_etc_issue_net > $root/etc/issue.net
|
||||
|
||||
host_zypper "base" install --auto-agree-with-licenses coreutils
|
||||
host_zypper "base" install --auto-agree-with-licenses coreutils sysvinit
|
||||
host_zypper "base update" install --auto-agree-with-licenses zypper
|
||||
|
||||
#undo_rpmnew
|
||||
setup_zypper_repos base update payload
|
||||
run setup_zypper_repos base update payload
|
||||
|
||||
echo "=== refreshing >"
|
||||
chroot $root zypper $zypper_global_opts refresh
|
||||
echo "=== refreshing <"
|
||||
|
||||
echo "=== installing payload packages >"
|
||||
chroot $root zypper $zypper_global_opts install --auto-agree-with-licenses $payload_pkgs
|
||||
echo "=== installing payload packages <"
|
||||
|
||||
fi # test
|
||||
setup_zypper_repos special
|
||||
chroot $root zypper $zypper_global_opts install --auto-agree-with-licenses $special_pkgs
|
||||
run setup_zypper_repos special
|
||||
run chroot $root zypper $zypper_global_opts install --auto-agree-with-licenses $special_pkgs
|
||||
|
||||
# chroot $root zypper $zypper_global_opts -t srcpackage --download-only $payload_pkgs
|
||||
#kernel_version=`readlink -f $root/boot/vmlinuz 2>/dev/null | xargs basename | sed 's/vmlinuz-//'`
|
||||
|
|
@ -870,7 +885,12 @@ get_opts "$@"
|
|||
init_root_password_file
|
||||
|
||||
if [ `whoami` != root ]; then
|
||||
sudo -i $0 $@ -p $root_password_file
|
||||
exe=$0
|
||||
[ ${exe:0:1} = / ] || {
|
||||
exe=`/bin/pwd`/$exe
|
||||
exe=`readlink -f $exe`
|
||||
}
|
||||
sudo -i $exe $@ -p $root_password_file
|
||||
exit $?
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -2005,7 +2005,7 @@ JNT_JCSDIR=/tmp
|
|||
--<<<-- jcs.conf.oldstyle --
|
||||
|
||||
-->>>-- jcs.conf --
|
||||
jcs_dir=/home/`who -m | awk '{print $1}'`/local/src/cvs.stable/conf/jannet.de/`hostname`/`/opt/ytools/bin/get_os.sh`
|
||||
jcs_dir=$HOME/`hostname`/`/opt/ytools/bin/get_os.sh`
|
||||
jcs_owner=root
|
||||
jcs_group=root
|
||||
jcs_log_dir=$jcs_dir/log
|
||||
|
|
|
|||
|
|
@ -1,20 +1,47 @@
|
|||
#!/bin/sh
|
||||
|
||||
filter_deleted()
|
||||
{
|
||||
local rc_file="$1"
|
||||
shift
|
||||
local cand
|
||||
for cand in "$@"; do
|
||||
grep -q "^R ./$cand/" $rc_file && continue
|
||||
echo $cand
|
||||
done
|
||||
}
|
||||
|
||||
list_dirents()
|
||||
{
|
||||
local dirs=`sed '/^D\// !d; s%^D/%%; s%/.*%%' $1/CVS/Entries`
|
||||
dirs="`filter_deleted $1/CVS/Entries $dirs`"
|
||||
local cands
|
||||
if [ -f $1/CVS/Entries.Log ]; then
|
||||
dirs="$dirs `sed '/^A D\// !d; s%^A D/%%; s%/.*%%' $1/CVS/Entries.Log`"
|
||||
cands="`sed '/^A D\// !d; s%^A D/%%; s%/.*%%' $1/CVS/Entries.Log`"
|
||||
dirs="$dirs `filter_deleted $1/CVS/Entries.Log $cands`"
|
||||
fi
|
||||
local files=`sed '/^\// !d; s%/%%; s%/.*%%; s%^%%' $1/CVS/Entries`
|
||||
files="`filter_deleted $1/CVS/Entries $files`"
|
||||
local d f
|
||||
for f in $files; do
|
||||
echo $1/$f
|
||||
done
|
||||
for d in $dirs; do
|
||||
echo $1/$d
|
||||
[ "$opt_only_regular_files" != 1 ] && echo $1/$d
|
||||
list_dirents $1/$d
|
||||
done
|
||||
}
|
||||
|
||||
set -- `getopt f "$@"`
|
||||
|
||||
while [ "$1" != -- ]; do
|
||||
case $1 in
|
||||
-f)
|
||||
opt_only_regular_files=1
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
shift
|
||||
|
||||
list_dirents .
|
||||
|
|
|
|||
|
|
@ -91,13 +91,16 @@
|
|||
%\usepackage{epsfig}
|
||||
%\usepackage[umlaute]
|
||||
|
||||
\usepackage[pdftex,colorlinks,backref,pagebackref,linkcolor=blue,citecolor=blue, urlcolor=blue]{hyperref}
|
||||
\usepackage[pdftex,breaklinks,breaklinks,colorlinks,backref,pagebackref,linkcolor=blue,citecolor=blue, urlcolor=blue]{hyperref}
|
||||
\usepackage[right]{eurosym}
|
||||
\usepackage{import}
|
||||
\usepackage[section]{placeins}
|
||||
|
||||
%\usepackage{natbib}
|
||||
%\bibliographystyle{plainnat}
|
||||
|
||||
\bibliographystyle{gerplain}
|
||||
\usepackage{cite}
|
||||
\bibliography{literatur}
|
||||
|
||||
%\textwidth 22.7cm
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@
|
|||
\usepackage{beamertexpower}
|
||||
\usepackage{beamerthemeshadow}
|
||||
%\hypersetup{colorlinks,linkcolor=blue}
|
||||
\usepackage[right]{eurosym}
|
||||
\usepackage{import}
|
||||
\usetheme{Darmstadt}
|
||||
|
||||
\usepackage[T1]{fontenc}
|
||||
|
|
|
|||
|
|
@ -63,6 +63,8 @@ DELETE
|
|||
%\usepackage{euler}
|
||||
%\usepackage{gletter}
|
||||
\usepackage{fnpara}
|
||||
\usepackage[right]{eurosym}
|
||||
\usepackage{import}
|
||||
|
||||
%\usepackage{acmconf}
|
||||
%\usepackage{articleJFPLC}
|
||||
|
|
|
|||
|
|
@ -91,14 +91,17 @@
|
|||
%\usepackage{epsfig}
|
||||
%\usepackage[umlaute]
|
||||
|
||||
\usepackage[pdftex,colorlinks,backref,pagebackref,linkcolor=blue,citecolor=blue, urlcolor=blue]{hyperref}
|
||||
\usepackage[pdftex,breaklinks,colorlinks,backref,pagebackref,linkcolor=blue,citecolor=blue, urlcolor=blue]{hyperref}
|
||||
\usepackage[section]{placeins}
|
||||
\usepackage{import}
|
||||
\usepackage[right]{eurosym}
|
||||
|
||||
%\usepackage{natbib}
|
||||
%\bibliographystyle{plainnat}
|
||||
|
||||
\bibliographystyle{gerplain}
|
||||
\bibliography{literatur}
|
||||
\usepackage{cite}
|
||||
|
||||
%\textwidth 22.7cm
|
||||
\topmargin -0.4cm
|
||||
|
|
|
|||
|
|
@ -60,6 +60,8 @@
|
|||
%\usepackage{euler}
|
||||
%\usepackage{gletter}
|
||||
\usepackage{fnpara}
|
||||
\usepackage[right]{eurosym}
|
||||
\usepackage{import}
|
||||
|
||||
%\usepackage{acmconf}
|
||||
%\usepackage{articleJFPLC}
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@
|
|||
\usepackage[footnotesize]{caption}
|
||||
%\usepackage{portland}
|
||||
\usepackage{float}
|
||||
\usepackage{cite}
|
||||
%---------------------- File "./base/proc.sty":
|
||||
%---------------------- File "./misc/blkarray.sty":
|
||||
%---------------------- File "./misc/doublespace.sty":
|
||||
|
|
@ -84,7 +85,10 @@
|
|||
\evensidemargin 0.5cm
|
||||
% \renewcommand{\baselinestretch}{1.5}
|
||||
|
||||
\usepackage[pdftex,colorlinks,backref,pagebackref,linkcolor=blue,citecolor=blue, urlcolor=blue]{hyperref}
|
||||
\usepackage[pdftex,breaklinks,colorlinks,backref,pagebackref,linkcolor=blue,citecolor=blue, urlcolor=blue]{hyperref}
|
||||
\usepackage[right]{eurosym}
|
||||
\usepackage{import}
|
||||
|
||||
|
||||
\newcommand{\C}{\mathbb{C}}
|
||||
\newcommand{\R}{\mathbb{R}}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue