Merge branch 'master' into package-management
Additional changes: * Add src/system/kernel/lib/zlib, which builds a kernel version of zlib, needed by packagefs. * BuildFeatures: Add a build feature "gcc2" to allow for easier checks. * Referenceable.cpp: Include <OS.h> instead of <debugger.h>. The latter is not needed and prevents building for the build platform. * zlib/zutil.h: Fix gcc 2 build. We really should use the external package instead. Conflicts: .gitignore build/jam/BuildSetup build/jam/FileRules build/jam/FloppyBootImage build/jam/HaikuImage build/jam/ImageRules build/jam/KernelRules build/jam/NetBootArchive build/jam/OptionalBuildFeatures build/jam/OptionalLibPackages build/jam/OptionalPackageDependencies build/jam/OptionalPackages build/scripts/build_haiku_image configure data/bin/installoptionalpackage data/system/boot/Bootscript headers/os/app/Message.h headers/os/package/PackageInfo.h headers/os/package/PackageInfoAttributes.h headers/os/package/PackageInfoSet.h headers/os/package/PackageRoster.h headers/os/package/PackageVersion.h headers/os/package/hpkg/PackageInfoAttributeValue.h headers/os/storage/FindDirectory.h headers/os/storage/Node.h headers/os/support/StringList.h headers/private/system/directories.h src/add-ons/kernel/drivers/audio/ac97/es1370/Jamfile src/add-ons/kernel/file_systems/packagefs/AttributeIndex.cpp src/add-ons/kernel/file_systems/packagefs/Jamfile src/add-ons/kernel/file_systems/packagefs/Package.cpp src/add-ons/kernel/file_systems/packagefs/Package.h src/add-ons/kernel/file_systems/packagefs/PackageDomain.cpp src/add-ons/kernel/file_systems/packagefs/PackageDomain.h src/add-ons/kernel/file_systems/packagefs/PackageFSRoot.cpp src/add-ons/kernel/file_systems/packagefs/PackageLinkDirectory.cpp src/add-ons/kernel/file_systems/packagefs/PackageLinkDirectory.h src/add-ons/kernel/file_systems/packagefs/PackageLinkSymlink.cpp src/add-ons/kernel/file_systems/packagefs/PackageLinkSymlink.h src/add-ons/kernel/file_systems/packagefs/PackageLinksDirectory.cpp src/add-ons/kernel/file_systems/packagefs/PackageNode.h src/add-ons/kernel/file_systems/packagefs/ResolvableFamily.cpp src/add-ons/kernel/file_systems/packagefs/Version.cpp src/add-ons/kernel/file_systems/packagefs/Version.h src/add-ons/kernel/file_systems/packagefs/Volume.cpp src/add-ons/kernel/file_systems/packagefs/Volume.h src/add-ons/kernel/file_systems/packagefs/kernel_interface.cpp src/add-ons/kernel/file_systems/userlandfs/shared/driver_settings.c src/apps/deskbar/BarApp.cpp src/apps/deskbar/BarMenuBar.cpp src/apps/deskbar/BarMenuBar.h src/apps/deskbar/BarView.cpp src/apps/deskbar/BarView.h src/apps/deskbar/BarWindow.cpp src/apps/deskbar/BarWindow.h src/apps/deskbar/DeskbarMenu.cpp src/apps/deskbar/DeskbarMenu.h src/apps/deskbar/DeskbarUtils.cpp src/apps/deskbar/DeskbarUtils.h src/apps/deskbar/ExpandoMenuBar.cpp src/apps/deskbar/ExpandoMenuBar.h src/apps/deskbar/TeamMenu.cpp src/apps/processcontroller/ProcessController.cpp src/apps/remotedesktop/RemoteDesktop.cpp src/bin/bash/config-top.h src/bin/finddir.c src/bin/package/Jamfile src/bin/package/command_add.cpp src/bin/package/command_create.cpp src/bin/package/command_list.cpp src/bin/package_repo/command_list.cpp src/bin/pkgman/command_refresh.cpp src/build/libbe/support/Jamfile src/build/libpackage/Jamfile src/build/libroot/Jamfile src/build/libroot/fs.cpp src/build/libroot/remapped_functions.h src/kits/locale/MutableLocaleRoster.cpp src/kits/opengl/GLRendererRoster.cpp src/kits/package/PackageInfo.cpp src/kits/package/PackageInfoSet.cpp src/kits/package/PackageRoster.cpp src/kits/package/PackageVersion.cpp src/kits/package/RepositoryCache.cpp src/kits/package/hpkg/PackageWriterImpl.cpp src/kits/package/hpkg/ReaderImplBase.cpp src/kits/package/hpkg/WriterImplBase.cpp src/kits/print/PrintTransport.cpp src/kits/print/Printer.cpp src/kits/screensaver/ScreenSaverRunner.cpp src/kits/support/StringList.cpp src/kits/tracker/ContainerWindow.cpp src/kits/tracker/DeskWindow.cpp src/kits/tracker/PoseView.cpp src/libs/print/libprint/Transport.cpp src/preferences/printers/AddPrinterDialog.cpp src/preferences/screensaver/ScreenSaverWindow.cpp src/servers/debug/DebugServer.cpp src/servers/input/AddOnManager.cpp src/servers/media_addon/MediaAddonServer.cpp src/system/boot/Jamfile src/system/boot/loader/Jamfile src/system/boot/loader/loader.cpp src/system/boot/loader/vfs.cpp src/system/kernel/fs/vfs.cpp src/system/kernel/fs/vfs_boot.cpp src/system/libroot/os/find_directory.cpp src/system/runtime_loader/runtime_loader.cpp src/tools/package/Jamfile
This commit is contained in:
Ingo Weinhold
@@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) 2010 Haiku, Inc.
|
||||
# Copyright (c) 2010-2012 Haiku, Inc.
|
||||
# Distributed under the terms of the MIT License.
|
||||
#
|
||||
# Authors:
|
||||
@@ -31,6 +31,7 @@ VIEW='View licenses'
|
||||
ABORT='Abort installation'
|
||||
OK='I agree to the licenses. Install firmwares.'
|
||||
|
||||
baseURL='http://www.haiku-files.org/files/wifi-firmwares'
|
||||
firmwareDir=`finddir B_SYSTEM_DATA_DIRECTORY`/firmware
|
||||
tempDir=`finddir B_COMMON_TEMP_DIRECTORY`/wifi-firmwares
|
||||
driversDir=`finddir B_SYSTEM_ADDONS_DIRECTORY`/kernel/drivers
|
||||
@@ -119,22 +120,6 @@ function DownloadFileIfNotCached()
|
||||
local msg="As a result, ${driver}'s firmware will not be installed."
|
||||
alert --warning "$error $msg"
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
|
||||
function OpenIntelFirmwareWebpage()
|
||||
{
|
||||
# OpenIntelFirmwareWebpage <url> <file>
|
||||
local url="$1"
|
||||
local file="$2"
|
||||
|
||||
echo "Downloading $file ..."
|
||||
alert --info "A webpage is going to open. Download and save $file in ${firmwareDir}/${driver}/"
|
||||
|
||||
open "$url"
|
||||
|
||||
alert --info "Click OK after the $file has been saved in ${firmwareDir}/${driver}/"
|
||||
}
|
||||
|
||||
|
||||
@@ -142,7 +127,7 @@ function SetFirmwarePermissions()
|
||||
{
|
||||
cd ${firmwareDir}/${driver}/
|
||||
for file in * ; do
|
||||
if [ "$file" != "$driver" ] ; then
|
||||
if [ "$file" != "$driver" ] && [ -f "$file" ] ; then
|
||||
chmod a=r $file
|
||||
fi
|
||||
done
|
||||
@@ -175,18 +160,14 @@ function PostFirmwareInstallation()
|
||||
|
||||
function InstallIpw2100()
|
||||
{
|
||||
driver='ipw2100'
|
||||
driver='iprowifi2100'
|
||||
PreFirmwareInstallation
|
||||
|
||||
# Extract contents.
|
||||
local file='ipw2100-fw-1.3.tgz'
|
||||
|
||||
# In case the file doesn's exist.
|
||||
if [ ! -e ${firmwareDir}/${driver}/$file ] ; then
|
||||
url='http://ipw2100.sourceforge.net/firmware.php?fid=4'
|
||||
OpenIntelFirmwareWebpage $url $file
|
||||
fi
|
||||
# TODO: handle when $file hasn't been saved in ${firmwareDir}/${driver}/
|
||||
local url="${baseURL}/intel/${file}"
|
||||
local dir="${firmwareDir}/${driver}"
|
||||
DownloadFileIfNotCached $url $file $dir
|
||||
|
||||
# Install the firmware & license file by extracting in place.
|
||||
cd "${firmwareDir}/${driver}"
|
||||
@@ -203,13 +184,9 @@ function InstallIprowifi2200()
|
||||
|
||||
# Extract contents.
|
||||
local file='ipw2200-fw-3.1.tgz'
|
||||
|
||||
# In case the file doesn't exist.
|
||||
if [ ! -e ${firmwareDir}/${driver}/$file ] ; then
|
||||
url=http://ipw2200.sourceforge.net/firmware.php?fid=8
|
||||
OpenIntelFirmwareWebpage $url $file
|
||||
fi
|
||||
# TODO: handle when $file hasn't been saved in ${firmwareDir}/${driver}/
|
||||
local url="${baseURL}/intel/${file}"
|
||||
local dir="${firmwareDir}/${driver}"
|
||||
DownloadFileIfNotCached $url $file $dir
|
||||
|
||||
cd "$tempDir"
|
||||
gunzip < "${firmwareDir}/${driver}/$file" | tar xf -
|
||||
@@ -255,7 +232,7 @@ function InstallMarvell88w8335()
|
||||
|
||||
# Download firmware archive.
|
||||
local file="malo-firmware-1.4.tgz"
|
||||
local url='http://www.nazgul.ch/malo/malo-firmware-1.4.tgz'
|
||||
local url="${baseURL}/marvell/${file}"
|
||||
local dir="${firmwareDir}/${driver}"
|
||||
DownloadFileIfNotCached $url $file "$dir"
|
||||
if [ $result -gt 0 ]; then
|
||||
@@ -280,7 +257,7 @@ function BuildBroadcomFWCutter()
|
||||
# Download & extract b43-fwcutter.
|
||||
local file="b43-fwcutter-012.tar.bz2"
|
||||
local dir="${firmwareDir}/${driver}/b43-fwcutter"
|
||||
local url="http://bu3sch.de/b43/fwcutter/b43-fwcutter-012.tar.bz2"
|
||||
local url="${baseURL}/b43/fwcutter/${file}"
|
||||
DownloadFileIfNotCached $url $file $dir
|
||||
if [ $result -gt 0 ]; then
|
||||
return $result
|
||||
@@ -292,7 +269,7 @@ function BuildBroadcomFWCutter()
|
||||
|
||||
# Download additonal files for building b43-fwcutter.
|
||||
cd b43-fwcutter-012
|
||||
local baseURL='http://svn.haiku-os.org/haiku/haiku/trunk/src/system/libroot/posix/glibc'
|
||||
local baseURL='http://cgit.haiku-os.org/haiku/plain/src/system/libroot/posix/glibc'
|
||||
DownloadFileIfNotCached ${baseURL}/string/byteswap.h byteswap.h $dir
|
||||
if [ $result -gt 0 ]; then
|
||||
return $result
|
||||
@@ -330,7 +307,7 @@ function CutAndInstallBroadcomFirmware()
|
||||
# Download firmware.
|
||||
local file="wl_apsta-3.130.20.0.o"
|
||||
local dir="${firmwareDir}/${driver}"
|
||||
local url='http://downloads.openwrt.org/sources/wl_apsta-3.130.20.0.o'
|
||||
local url="${baseURL}/b43/${file}"
|
||||
DownloadFileIfNotCached $url $file $dir
|
||||
if [ $result -gt 0 ]; then
|
||||
return $result
|
||||
|
||||
+14
-4
@@ -2,8 +2,9 @@
|
||||
#
|
||||
# setgcc [ <arch> ] [ <gcc> ]
|
||||
|
||||
abiDir=/boot/develop/abi/
|
||||
abiDir=/boot/develop/abi
|
||||
abiLink=$abiDir/current
|
||||
libDir=/boot/develop/lib
|
||||
|
||||
usage()
|
||||
{
|
||||
@@ -13,7 +14,7 @@ Usage: $0 [ <arch> ] [ <gcc> ]
|
||||
Sets the current gcc version, respectively prints it, if no arguments are
|
||||
given.
|
||||
|
||||
<arch> - The architecture to set. Supported values: "x86".
|
||||
<arch> - The architecture to set. Supported values: "x86", "ppc".
|
||||
<gcc> - The major gcc version to set. Supported values: "gcc2", "gcc4".
|
||||
|
||||
EOF
|
||||
@@ -46,6 +47,7 @@ while [ $# -gt 0 ]; do
|
||||
case $1 in
|
||||
-h,--help) usage; exit;;
|
||||
x86) arch=$1;;
|
||||
ppc) arch=$1;;
|
||||
gcc2|gcc4) gcc=$1;;
|
||||
*) usage; exit 1;;
|
||||
esac
|
||||
@@ -76,8 +78,9 @@ if [ -z "$gcc" ]; then
|
||||
fi
|
||||
fi
|
||||
|
||||
# check whether the gcc exits
|
||||
if [ ! -e $abiDir/$arch/$gcc/tools/current/bin/gcc ]; then
|
||||
# check whether the gcc exists
|
||||
count=`ls -l $abiDir/$arch/$gcc/tools/current/bin/*gcc 2>/dev/null | wc -l`
|
||||
if [ $count -eq 0 ]; then
|
||||
echo "Can't set GCC $arch/$gcc -- not installed." >&2
|
||||
exit 1
|
||||
fi
|
||||
@@ -87,3 +90,10 @@ fi
|
||||
echo "Failed to set GCC $arch/$gcc." >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
# create the lib symlink
|
||||
libLink=$libDir/$arch
|
||||
( rm -f $libLink && ln -sf $abiDir/$arch/$gcc/lib $libLink ) || {
|
||||
echo "Failed to set lib $arch/$gcc." >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
#!/bin/bash
|
||||
|
||||
userGuideURL="\
|
||||
http://svn.haiku-os.org/haiku/haiku/trunk/docs/userguide/en/contents.html"
|
||||
http://cgit.haiku-os.org/haiku/plain/docs/userguide/en/contents.html"
|
||||
userGuideDir=/boot/system/documentation/userguide/
|
||||
userGuide=$userGuideDir/en/contents.html
|
||||
localizedUserGuide=$userGuideDir/"$LANG"/contents.html
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
#!/bin/bash
|
||||
|
||||
welcomeURL="\
|
||||
http://svn.haiku-os.org/haiku/haiku/trunk/docs/welcome/welcome_en.html"
|
||||
http://cgit.haiku-os.org/haiku/plain/docs/welcome/welcome_en.html"
|
||||
welcomeDir=/boot/system/documentation/welcome/
|
||||
welcomeFile=$welcomeDir/welcome_en.html
|
||||
localizedWelcomeFile=$welcomeDir/welcome_"$LANG".html
|
||||
|
||||
Reference in New Issue
Block a user