Browse Source

Stefan Fiedler:


			
			
				rocklinux
			
			
		
Stefan Fiedler 17 years ago
parent
commit
e1fc3adf83
23 changed files with 43 additions and 33 deletions
  1. +2
    -0
      package/base/dvd+rwtools/dvd+rwtools.conf
  2. +1
    -1
      package/base/e2fsprogs/e2fsprogs.conf
  3. +1
    -1
      package/base/ed/ed.conf
  4. +3
    -3
      package/base/etcnet/etcnet.conf
  5. +1
    -1
      package/base/file/file.desc
  6. +9
    -10
      package/base/gcc/gcc.conf
  7. +2
    -0
      package/base/less/less.conf
  8. +1
    -0
      package/base/libelf/libelf.conf
  9. +2
    -0
      package/base/libmng/libmng.conf
  10. +5
    -3
      package/base/mine/mine.conf
  11. +2
    -0
      package/base/mktemp/mktemp.conf
  12. +1
    -0
      package/base/patch/patch.conf
  13. +3
    -2
      package/base/pciutils/pciutils.conf
  14. +0
    -6
      package/base/samba/samba.conf
  15. +1
    -0
      package/base/time/time.conf
  16. +1
    -1
      package/base/udev/udev.conf
  17. +1
    -1
      package/base/usbutils/usbutils.desc
  18. +2
    -0
      package/base/zlib/zlib.conf
  19. +1
    -0
      package/gnome2/poppler-data/poppler-data.conf
  20. +1
    -1
      package/target-finish/1st-stage/1st-stage.conf
  21. +1
    -1
      package/target-finish/2nd-stage/2nd-stage.conf
  22. +1
    -1
      package/target-finish/bootloader/bootloader.conf
  23. +1
    -1
      package/target-finish/bootloader/powerpc/build.sh

+ 2
- 0
package/base/dvd+rwtools/dvd+rwtools.conf

@ -1 +1,3 @@
hook_add inmake 5 '$MAKE +rpl8 +btcflash'
var_append makeinstopt ' ' 'prefix=$root/$prefix'

+ 1
- 1
package/base/e2fsprogs/e2fsprogs.conf

@ -23,7 +23,7 @@
libdir="$root/$multilib"
var_append extraconfopt " " '--with-root-prefix=$instroot/'
# var_append extraconfopt " " '--with-root-prefix=$instroot/'
var_append extraconfopt " " '--enable-fsck --enable-elf-shlibs --disable-evms'
# var_append extraconfopt " " '--with-cc="$CC" --with-linker="$LD"'

+ 1
- 1
package/base/ed/ed.conf

@ -30,6 +30,6 @@ fix_usrbin_bin() {
fi
}
confopt="--prefic=$root/$prefix"
confopt="--prefix=/$prefix"
postmake="fix_usrbin_bin"

+ 3
- 3
package/base/etcnet/etcnet.conf

@ -1,6 +1,6 @@
prefix=$root
var_append makeopt " " "-f contrib/Makefile"
var_append makeinstopt " " "-f contrib/Makefile"
prefix=
var_append makeopt " " "prefix=/$prefix -f contrib/Makefile"
var_append makeinstopt " " "prefix=$root/$prefix -f contrib/Makefile"
etcnet_postmake() {
install -m 644 contrib/50-RockLinux-3 $root/etc/net/options.d/

+ 1
- 1
package/base/file/file.desc

@ -38,7 +38,7 @@
[L] BSD
[S] Stable
[V] 4.21
[P] X --?--5---9 103.400
[P] X --X--5---9 103.400
[D] 1641533042 file-4.21.tar.gz ftp://ftp.astron.com/pub/file/

+ 9
- 10
package/base/gcc/gcc.conf

@ -122,15 +122,14 @@ elif [ $stagelevel -ge 2 ] ; then
# moving them to their final directories.
#
var_append makeopt " " "prefix=/$prefix"
var_append makeinstopt " " "prefix=$root/$prefix"
for x in bin info man data ; do
mkdir -p $builddir/inst_$x
var_append makeinstopt " " "${x}dir=$builddir/inst_$x"
mkdir -p $dummydir/inst_$x
eval "${x}dir=$dummydir/inst_$x"
done
# libstdc++ locales are not installed to the $datadir without this.
var_append INSTALL_WRAPPER_FILTER "|" "sed -e \
's,$root/$prefix/share\(/locale/.*/libstdc++.mo\),$builddir/inst_data\1,'"
's,$root/$prefix/share\(/locale/.*/libstdc++.mo\),$dummydir/inst_data\1,'"
var_append extraconfopt " " "--enable-version-specific-runtime-libs"
fi
@ -199,7 +198,7 @@ custmain () {
if [ $stagelevel -ge 2 -a -z "$pkg_gcc_cross" ] ; then
# Rename and install binaries
#
cd $builddir/inst_bin ; mkdir -p $root/$prefix/bin
cd $dummydir/inst_bin ; mkdir -p $root/$prefix/bin
for y in c++ c++filt g++ cpp f77 g77 gfortran gcc gcov ; do
for x in $y ${pkg_gcc_target}-$y ; do
if [ -f "$x" ] ; then
@ -210,7 +209,7 @@ custmain () {
# Rename and install info-files
#
cd $builddir/inst_info ; mkdir -p $root/$prefix/info
cd $dummydir/inst_info ; mkdir -p $root/$prefix/info
for x in * ; do
[ ! -f $x ] && continue # e.g. if $x becomes '*' somehow
fn=$( echo $x | sed "s,\([a-z0-9]*\),\1-${pkg_gcc_version}," )
@ -226,7 +225,7 @@ custmain () {
# Rename and install man-pages
#
cd $builddir/inst_man/man1
cd $dummydir/inst_man/man1
mkdir -p $root/$prefix/man/man1
for x in * ; do
[ ! -f $x ] && continue # e.g. if $x becomes '*' somehow
@ -237,7 +236,7 @@ custmain () {
true
done
cd $builddir/inst_man/man7
cd $dummydir/inst_man/man7
mkdir -p $root/$prefix/man/man7
for x in * ; do
[ ! -f $x ] && continue # e.g. if $x becomes '*' somehow
@ -250,8 +249,8 @@ custmain () {
# Rename and install locales
#
if [ -d "$builddir/inst_data/locale" ] ; then
cd $builddir/inst_data/locale
if [ -d "$dummydir/inst_data/locale" ] ; then
cd $dummydir/inst_data/locale
for x in */LC_MESSAGES/*.mo ; do
[ ! -f "$x" ] && continue # e.g. if $x becomes '*' somehow
y="$root/$prefix/share/locale/$x"

+ 2
- 0
package/base/less/less.conf

@ -1,3 +1,4 @@
#!/bin/bash
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
@ -40,3 +41,4 @@ EOP
hook_add postmake 3 "less_postmake"
var_append makeinstopt ' ' 'bindir=$bindir mandir=$mandir'

+ 1
- 0
package/base/libelf/libelf.conf

@ -0,0 +1 @@
var_append makeinstopt ' ' 'instroot=$root'

+ 2
- 0
package/base/libmng/libmng.conf

@ -21,3 +21,5 @@
# --- ROCK-COPYRIGHT-NOTE-END ---
hook_add premake 3 "cp -a makefiles/makefile.linux Makefile"
var_append makeinstopt ' ' 'prefix=$root/$prefix'

+ 5
- 3
package/base/mine/mine.conf

@ -22,15 +22,17 @@
# --- ROCK-COPYRIGHT-NOTE-END ---
makeopt="$makeopt CONFOPT=\"--build=\$arch_build --host=\$arch_target --cache-file=../config.cache\""
makeinstopt="$makeinstopt sysprefix=$instroot"
makeinstopt="$makeinstopt sysprefix=$instroot prefix=$instroot/$prefix"
if [ "$stagelevel" -ge 3 -a -f $root/usr/lib/libdialog.a ]
if [ -f $root/usr/$multilib/libdialog.a ]
then
makeopt="$makeopt USE_GAS=1"
makeinstopt="$makeinstopt USE_GAS=1"
else
makeopt="$makeopt USE_GAS=0"
makeinstopt="$makeinstopt USE_GAS=0"
premake="create_config_cache > config.cache"
fi
if [ $stagelevel -le 2 ] ; then
premake="create_config_cache > config.cache"
fi

+ 2
- 0
package/base/mktemp/mktemp.conf

@ -3,3 +3,5 @@ if [ $stagelevel -le 2 ] ; then
hook_add preconf 5 "echo sudo_cv_ebcdic=no > config.cache"
var_append extraconfopt " " "--cache-file=config.cache"
fi
var_append makeinstopt ' ' 'bindir=$bindir mandir=$mandir'

+ 1
- 0
package/base/patch/patch.conf

@ -0,0 +1 @@
var_append makeinstopt ' ' 'bindir=$bindir libdir=$libdir mandir=$mandir'

+ 3
- 2
package/base/pciutils/pciutils.conf

@ -1,3 +1,4 @@
#!/bin/bash
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
@ -21,8 +22,8 @@
# --- ROCK-COPYRIGHT-NOTE-END ---
# pciutils 2.1.11+ install location always defaults to /usr/local
makeopt="PREFIX=$root/$prefix $makeopt"
makeinstopt="PREFIX=$root/$prefix $makeinstopt"
var_append makeopt ' ' 'PREFIX=/$prefix'
var_append makeinstopt ' ' 'PREFIX=/$prefix'
# see no-uname-m.patch.cross
if [ $stagelevel -le 1 ]; then

+ 0
- 6
package/base/samba/samba.conf

@ -32,12 +32,6 @@ var_append extraconfopt " " "--with-smbmount --with-automount \
--with-swatdir=$root/$prefix/share/swat --with-quotas --with-fhs \
--with-acl-support --with-libsmbclient"
var_append makeopt " " "LIBDIR=$root/$prefix/lib"
var_append makeinstopt " " "LIBDIR=$root/$prefix/lib"
var_append makeopt " " "LIBDIR=$root/$prefix/lib"
var_append makeinstopt " " "LIBDIR=$root/$prefix/lib"
if ! [ "$arch" = x86 -a "$ROCKCFG_X86_BITS" = "64" ] ; then
var_append extraconfopt ' ' "--with-spinlocks"
fi

+ 1
- 0
package/base/time/time.conf

@ -0,0 +1 @@
var_append makeinstopt ' ' 'bindir=$bindir infodir=$infodir'

+ 1
- 1
package/base/udev/udev.conf

@ -62,7 +62,7 @@ udev_prem() {
done
# DESTDIR=/ prevents kill and restart of udev.
var_append makeopt " " 'EXTRAS="${udev_extras}"'
var_append makeinstopt " " 'DESTDIR=/ EXTRAS="${udev_extras}"'
var_append makeinstopt " " 'EXTRAS="${udev_extras}"'
}
prefix=""

+ 1
- 1
package/base/usbutils/usbutils.desc

@ -37,7 +37,7 @@
[L] GPL
[S] Stable
[V] 0.72
[P] X --X--5---9 221.700
[P] X --X--5---9 171.700
[D] 1187204070 usbutils-0.72.tar.gz http://downloads.sourceforge.net/linux-usb/

+ 2
- 0
package/base/zlib/zlib.conf

@ -35,6 +35,8 @@ zlib_pm() {
var_append makeopt ' ' 'AR="$AR rc"'
hook_add postmake 3 "zlib_pm"
var_append makeinstopt ' ' 'prefix=$instroot/$prefix libdir=$libdir mandir=$mandir includedir=$includedir'
# optimized code
#
#case "$arch_machine" in

+ 1
- 0
package/gnome2/poppler-data/poppler-data.conf

@ -0,0 +1 @@
var_append makeinstopt ' ' 'prefix=/$prefix'

+ 1
- 1
package/target-finish/1st-stage/1st-stage.conf

@ -13,7 +13,7 @@ initrd_config="$ROCKCFG_PKG_1ST_STAGE_INITRD"
rootdir="$root"
build_rock="$root/ROCK"
disksdir="$build_rock/target"
disksdir="$build_rock/target-finish"
mkdir -p "$disksdir"
targetdir="$disksdir/$initrd_config"

+ 1
- 1
package/target-finish/2nd-stage/2nd-stage.conf

@ -71,7 +71,7 @@ if [ "$ROCK_BUILD_TARGET" != 1 ] ; then
fi
build_rock="$root/ROCK"
disksdir="$build_rock/target"
disksdir="$build_rock/target-finish"
echo "Creating 2nd stage filesystem:"

+ 1
- 1
package/target-finish/bootloader/bootloader.conf

@ -12,7 +12,7 @@ fi
rootdir="$root"
build_rock="$root/ROCK"
disksdir="$build_rock/target"
disksdir="$build_rock/target-finish"
tmpdir="$( mktemp -d )" ; mkdir -p "$tmpdir"
pkg_suffix=.no_binpkg

+ 1
- 1
package/target-finish/bootloader/powerpc/build.sh

@ -36,7 +36,7 @@ then
echo "Copy more config files."
cp -v $confdir/powerpc/mapping .
#
datadir="build/${ROCKCFG_ID}/ROCK/target"
datadir="build/${ROCKCFG_ID}/ROCK/target-finish"
cat > $xroot/ROCK/isofs_arch.txt <<- EOT
BOOT -hfs -part -map $datadir/mapping -hfs-volid "ROCK_Linux_CD"
BOOTx -hfs-bless boot -sysid PPC -l -L -r -T -chrp-boot

Loading…
Cancel
Save