openmamba/makedist-openmamba
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some trivial fixes

Browse Source
This commit is contained in:
Silvan Calarco 2011-10-26 21:54:36 +02:00
parent bb243c0b2c
commit e558e9a73a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
makedist.inc.sh
View File

@ -88,7 +88,7 @@ sed -i "s|\(127\.0\.0\.1\W*\)\(.*\)|\1 $TARGET_HOSTNAME.$TARGET_DOMAIN $TARGET_H
install_rpms_by_target "Installing ${PLATFORM} platform packages" ${MAKEDIST_TARGET}-${PLATFORM} "${RPMEXTRAARGS}" install_rpms_by_target "Installing ${PLATFORM} platform packages" ${MAKEDIST_TARGET}-${PLATFORM} "${RPMEXTRAARGS}"
[ "$LANGUAGE" ] && install_rpms_by_target "Installing ${PLATFORM} platform localization packages for language $LANGUAGE" ${MAKEDIST_TARGET}-${PLATFORM}-${LANGUAGE} "${RPMEXTRAARGS}" [ "$LANGUAGE" ] && install_rpms_by_target "Installing ${PLATFORM} platform localization packages for language $LANGUAGE" ${MAKEDIST_TARGET}-${PLATFORM}-${LANGUAGE} "${RPMEXTRAARGS}"
[ "$ARCH" ] && install_rpms_by_target "Installing ${PLATFORM} platform localization packages for arch $ARCH" ${MAKEDIST_TARGET}-${PLATFORM}-${ARCH} "${RPMEXTRAARGS}" [ "$ARCH" ] && install_rpms_by_target "Installing ${PLATFORM} platform packages for arch $ARCH" ${MAKEDIST_TARGET}-${PLATFORM}-${ARCH} "${RPMEXTRAARGS}"
if [ ! "$KERNEL_IGNORE" ]; then if [ ! "$KERNEL_IGNORE" ]; then
for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
@ -104,11 +104,11 @@ fi
if [ ${DEBUG:-0} -gt 0 ]; then if [ ${DEBUG:-0} -gt 0 ]; then
install_rpms_by_target "Installing debugging packages." ${MAKEDIST_TARGET}-debug "${RPMEXTRAARGS}" install_rpms_by_target "Installing debugging packages." ${MAKEDIST_TARGET}-debug "${RPMEXTRAARGS}"
cat > $MOUNTDIR/etc/sysconfig/network-devices/ifconfig.eth0 << _EOF cat > $MOUNTDIR/etc/sysconfig/network-scripts/ifcfg-eth0 << _EOF
IF=eth0 DEVICE=eth0
ONBOOT=yes
ZONE=local
BOOTPROTO=dhcp BOOTPROTO=dhcp
ONBOOT=yes
#NM_CONTROLLED=no
_EOF _EOF
fi fi

2
platforms/sdk-root/Makefile
View File

@ -19,6 +19,6 @@ $(MAKEDIST_TARGET)-sdk-root-missing: wpa_supplicant dosfstools cups vim postplug
$(MAKEDIST_TARGET)-sdk-root-en: $(MAKEDIST_TARGET)-sdk-root-en:
$(MAKEDIST_TARGET)-sdk-root-it: $(MAKEDIST_TARGET)-sdk-root-it:
$(MAKEDIST_TARGET)-sdk-root-es: $(MAKEDIST_TARGET)-sdk-root-es:
$(MAKEDIST_TARGET)-sdk-root-i586: grub2 $(MAKEDIST_TARGET)-sdk-root-i586: grub
$(MAKEDIST_TARGET)-sdk-root-arm: $(MAKEDIST_TARGET)-sdk-root-arm:
$(MAKEDIST_TARGET)-sdk-root-ppc: yaboot $(MAKEDIST_TARGET)-sdk-root-ppc: yaboot