Merge branch 'package-management'
Conflicts: src/preferences/network/Jamfile
This commit is contained in:
Ingo Weinhold
@@ -18,8 +18,3 @@ Addon intel_extreme.accelerant :
|
||||
# overlay_3d_i965.cpp
|
||||
: be libaccelerantscommon.a
|
||||
;
|
||||
|
||||
Package haiku-intel_extreme-cvs :
|
||||
intel_extreme.accelerant :
|
||||
boot home config add-ons accelerants ;
|
||||
|
||||
|
||||
@@ -20,10 +20,6 @@ Addon matrox.accelerant :
|
||||
: libmatrox_engine.a
|
||||
;
|
||||
|
||||
Package haiku-matrox-cvs :
|
||||
matrox.accelerant :
|
||||
boot home config add-ons accelerants ;
|
||||
|
||||
Depends matrox.accelerant : matrox ;
|
||||
|
||||
SubInclude HAIKU_TOP src add-ons accelerants matrox engine ;
|
||||
|
||||
@@ -21,10 +21,6 @@ Addon neomagic.accelerant :
|
||||
: libneomagic_engine.a
|
||||
;
|
||||
|
||||
Package haiku-neomagic-cvs :
|
||||
neomagic.accelerant :
|
||||
boot home config add-ons accelerants ;
|
||||
|
||||
Depends neomagic.accelerant : neomagic ;
|
||||
|
||||
SubInclude HAIKU_TOP src add-ons accelerants neomagic engine ;
|
||||
|
||||
@@ -22,10 +22,6 @@ Addon nvidia.accelerant :
|
||||
: libnvidia_engine.a libaccelerantscommon.a
|
||||
;
|
||||
|
||||
Package haiku-nvidia-cvs :
|
||||
nvidia.accelerant :
|
||||
boot home config add-ons accelerants ;
|
||||
|
||||
Depends nvidia.accelerant : nvidia ;
|
||||
|
||||
SubInclude HAIKU_TOP src add-ons accelerants nvidia engine ;
|
||||
|
||||
@@ -20,10 +20,6 @@ Addon nvidia_gpgpu.accelerant :
|
||||
: libnvidia_gpgpu_engine.a
|
||||
;
|
||||
|
||||
Package haiku-nvidia_gpgpu-cvs :
|
||||
nvidia_gpgpu.accelerant :
|
||||
boot home config add-ons accelerants ;
|
||||
|
||||
Depends nvidia_gpgpu.accelerant : nvidia_gpgpu ;
|
||||
|
||||
SubInclude HAIKU_TOP src add-ons accelerants nvidia_gpgpu engine ;
|
||||
|
||||
@@ -36,8 +36,4 @@ Addon radeon.accelerant :
|
||||
: libaccelerantscommon.a libradeon.a be
|
||||
;
|
||||
|
||||
Package haiku-radeon-cvs :
|
||||
radeon.accelerant :
|
||||
boot home config add-ons accelerants ;
|
||||
|
||||
Depends radeon.accelerant : radeon ;
|
||||
|
||||
@@ -36,8 +36,3 @@ Addon s3.accelerant :
|
||||
|
||||
: be libaccelerantscommon.a
|
||||
;
|
||||
|
||||
Package haiku-s3-cvs :
|
||||
s3.accelerant :
|
||||
boot home config add-ons accelerants ;
|
||||
|
||||
|
||||
@@ -21,10 +21,6 @@ Addon skel.accelerant :
|
||||
: libskeleton_engine.a
|
||||
;
|
||||
|
||||
Package haiku-skeleton-cvs :
|
||||
skel.accelerant :
|
||||
boot home config add-ons accelerants ;
|
||||
|
||||
Depends skel.accelerant : skel.driver ;
|
||||
|
||||
SubInclude HAIKU_TOP src add-ons accelerants skeleton engine ;
|
||||
|
||||
@@ -21,10 +21,6 @@ Addon via.accelerant :
|
||||
: libvia_engine.a
|
||||
;
|
||||
|
||||
Package haiku-via_gfx-cvs :
|
||||
via.accelerant :
|
||||
boot home config add-ons accelerants ;
|
||||
|
||||
Depends via.accelerant : via ;
|
||||
|
||||
SubInclude HAIKU_TOP src add-ons accelerants via engine ;
|
||||
|
||||
@@ -17,7 +17,3 @@ Addon vmware.accelerant :
|
||||
ProposeDisplayMode.c
|
||||
SetDisplayMode.c
|
||||
;
|
||||
|
||||
Package haiku-vmware-video-svn :
|
||||
vmware.accelerant :
|
||||
boot home config add-ons accelerants ;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
SubDir HAIKU_TOP src add-ons decorators BeDecorator ;
|
||||
|
||||
UseHeaders $(HAIKU_FREETYPE_HEADERS) : true ;
|
||||
UseBuildFeatureHeaders freetype ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter ] ;
|
||||
@@ -10,9 +10,8 @@ UsePrivateHeaders kernel ;
|
||||
|
||||
AddResources ClassicBe : resources.rdef ;
|
||||
|
||||
#TODO: See #8716, hrev44313 for ft2build.h: No such file or directory
|
||||
#Includes [ FGristFiles BeDecorator.cpp ]
|
||||
# : $(HAIKU_FREETYPE_HEADERS_DEPENDENCY) ;
|
||||
Includes [ FGristFiles BeDecorator.cpp ]
|
||||
: [ BuildFeatureAttribute freetype : headers ] ;
|
||||
|
||||
Addon ClassicBe :
|
||||
BeDecorator.cpp
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
SubDir HAIKU_TOP src add-ons decorators MacDecorator ;
|
||||
|
||||
UseHeaders $(HAIKU_FREETYPE_HEADERS) : true ;
|
||||
UseBuildFeatureHeaders freetype ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app decorator ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing ] ;
|
||||
@@ -13,7 +13,7 @@ UsePrivateHeaders kernel ;
|
||||
AddResources MacDecorator : resources.rdef ;
|
||||
|
||||
Includes [ FGristFiles MacDecorator.cpp ]
|
||||
: $(HAIKU_FREETYPE_HEADERS_DEPENDENCY) ;
|
||||
: [ BuildFeatureAttribute freetype : headers ] ;
|
||||
|
||||
Addon MacDecorator :
|
||||
MacDecorator.cpp
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
SubDir HAIKU_TOP src add-ons decorators WinDecorator ;
|
||||
|
||||
UseHeaders $(HAIKU_FREETYPE_HEADERS) : true ;
|
||||
UseBuildFeatureHeaders freetype ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter ] ;
|
||||
@@ -10,9 +10,8 @@ UsePrivateHeaders kernel ;
|
||||
|
||||
AddResources WinDecorator : resources.rdef ;
|
||||
|
||||
#TODO: See #8716, hrev44313 for ft2build.h: No such file or directory
|
||||
#Includes [ FGristFiles WinDecorator.cpp ]
|
||||
# : $(HAIKU_FREETYPE_HEADERS_DEPENDENCY) ;
|
||||
Includes [ FGristFiles WinDecorator.cpp ]
|
||||
: [ BuildFeatureAttribute freetype : headers ] ;
|
||||
|
||||
Addon WinDecorator :
|
||||
WinDecorator.cpp
|
||||
|
||||
@@ -13,7 +13,7 @@ Addon <disk_system>bfs :
|
||||
|
||||
bfs_disk_system.cpp
|
||||
|
||||
: be $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++) libshared.a
|
||||
: be localestub $(TARGET_LIBSUPC++) libshared.a
|
||||
;
|
||||
|
||||
DoCatalogs <disk_system>bfs :
|
||||
|
||||
@@ -23,7 +23,7 @@ Addon <disk_system>intel :
|
||||
# kernel sources
|
||||
PartitionMap.cpp
|
||||
|
||||
: be libshared.a $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++)
|
||||
: be libshared.a localestub $(TARGET_LIBSUPC++)
|
||||
;
|
||||
|
||||
DoCatalogs <disk_system>intel :
|
||||
|
||||
@@ -11,7 +11,7 @@ Addon <disk_system>ntfs :
|
||||
NTFSAddOn.cpp
|
||||
InitializeParameterEditor.cpp
|
||||
|
||||
: be $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++) libshared.a
|
||||
: be localestub $(TARGET_LIBSUPC++) libshared.a
|
||||
;
|
||||
|
||||
DoCatalogs <disk_system>ntfs :
|
||||
|
||||
@@ -14,11 +14,7 @@ Addon <input>keyboard :
|
||||
TeamMonitorWindow.cpp
|
||||
TeamListItem.cpp
|
||||
|
||||
: input_server be libshared.a $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++) ;
|
||||
|
||||
Package haiku-inputkit-cvs :
|
||||
<input>keyboard :
|
||||
boot home config add-ons input_server devices ;
|
||||
: input_server be libshared.a localestub $(TARGET_LIBSUPC++) ;
|
||||
|
||||
DoCatalogs <input>keyboard :
|
||||
x-vnd.Haiku-KeyboardInputServerDevice
|
||||
|
||||
@@ -7,7 +7,3 @@ UsePrivateHeaders input shared ;
|
||||
Addon <input>mouse :
|
||||
MouseInputDevice.cpp
|
||||
: be input_server $(TARGET_LIBSUPC++) ;
|
||||
|
||||
Package haiku-inputkit-cvs :
|
||||
<input>mouse :
|
||||
boot home config add-ons input_server devices ;
|
||||
|
||||
@@ -8,7 +8,3 @@ Addon <input>serial_mouse :
|
||||
MouseInputDevice.cpp
|
||||
SerialMouse.cpp
|
||||
: be device input_server ;
|
||||
|
||||
Package haiku-inputkit-cvs :
|
||||
<input>serial_mouse :
|
||||
boot home config add-ons input_server devices ;
|
||||
|
||||
@@ -7,7 +7,3 @@ UsePrivateHeaders input ;
|
||||
Addon <input>tablet :
|
||||
TabletInputDevice.cpp
|
||||
: be input_server $(TARGET_LIBSUPC++) ;
|
||||
|
||||
Package haiku-inputkit-cvs :
|
||||
<input>tablet :
|
||||
boot home config add-ons input_server devices ;
|
||||
|
||||
@@ -11,7 +11,3 @@ Addon <input>wacom :
|
||||
PointingDeviceFactory.cpp
|
||||
TabletDevice.cpp
|
||||
: be input_server $(TARGET_LIBSUPC++) ;
|
||||
|
||||
Package haiku-inputkit-cvs :
|
||||
<input>tablet :
|
||||
boot home config add-ons input_server devices ;
|
||||
|
||||
@@ -7,8 +7,3 @@ UsePrivateHeaders screen_saver ;
|
||||
Addon screen_saver :
|
||||
ScreenSaverFilter.cpp
|
||||
: be libscreensaver.so input_server $(TARGET_LIBSUPC++) ;
|
||||
|
||||
Package haiku-screensaverkit-cvs :
|
||||
screen_saver :
|
||||
boot home config add-ons input_server filters
|
||||
;
|
||||
|
||||
@@ -1,16 +1,21 @@
|
||||
SubDir HAIKU_TOP src add-ons input_server filters shortcut_catcher ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
UsePrivateHeaders storage ;
|
||||
|
||||
# Common files used here and in the app
|
||||
StaticLibrary libshortcuts_shared.a :
|
||||
BitFieldTesters.cpp
|
||||
CommandActuators.cpp
|
||||
KeyInfos.cpp
|
||||
ParseCommandLine.cpp
|
||||
;
|
||||
local architectureObject ;
|
||||
for architectureObject in [ MultiArchSubDirSetup ] {
|
||||
on $(architectureObject) {
|
||||
local architecture = $(TARGET_PACKAGING_ARCH) ;
|
||||
|
||||
# Common files used here and in the app
|
||||
StaticLibrary [ MultiArchDefaultGristFiles libshortcuts_shared.a ] :
|
||||
BitFieldTesters.cpp
|
||||
CommandActuators.cpp
|
||||
KeyInfos.cpp
|
||||
ParseCommandLine.cpp
|
||||
;
|
||||
}
|
||||
}
|
||||
|
||||
Addon shortcut_catcher :
|
||||
CommandExecutor.cpp
|
||||
|
||||
@@ -19,9 +19,5 @@ Addon canna :
|
||||
PaletteWindow.cpp
|
||||
: be textencoding input_server libcanna.a librk.a $(TARGET_LIBSUPC++) ;
|
||||
|
||||
Package haiku-cannaIM-cvs :
|
||||
canna :
|
||||
boot home config add-ons input_server methods ;
|
||||
|
||||
SubInclude HAIKU_TOP src add-ons input_server methods canna lib ;
|
||||
SubInclude HAIKU_TOP src add-ons input_server methods canna rk ;
|
||||
|
||||
@@ -3,8 +3,9 @@ SubDir HAIKU_TOP src add-ons input_server methods canna lib ;
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
# filter warnings we don't want here
|
||||
TARGET_WARNING_CCFLAGS = [ FFilter $(TARGET_WARNING_CCFLAGS)
|
||||
: -Wmissing-prototypes ] ;
|
||||
TARGET_WARNING_CCFLAGS_$(TARGET_PACKAGING_ARCH)
|
||||
= [ FFilter $(TARGET_WARNING_CCFLAGS_$(TARGET_PACKAGING_ARCH))
|
||||
: -Wmissing-prototypes ] ;
|
||||
|
||||
SubDirCcFlags -x c++ -ansi -trigraphs -funsigned-char -funsigned-bitfields -w -Wno-multichar -Wno-ctor-dtor-privacy -pedantic -Wno-long-long -Woverloaded-virtual -D_BUILDING_CANNALIB -D_WCHAR_T ;
|
||||
|
||||
|
||||
@@ -3,8 +3,9 @@ SubDir HAIKU_TOP src add-ons input_server methods canna rk ;
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
# filter warnings we don't want here
|
||||
TARGET_WARNING_CCFLAGS = [ FFilter $(TARGET_WARNING_CCFLAGS)
|
||||
: -Wmissing-prototypes ] ;
|
||||
TARGET_WARNING_CCFLAGS_$(TARGET_PACKAGING_ARCH)
|
||||
= [ FFilter $(TARGET_WARNING_CCFLAGS_$(TARGET_PACKAGING_ARCH))
|
||||
: -Wmissing-prototypes ] ;
|
||||
|
||||
SubDirCcFlags -x c++ -ansi -trigraphs -funsigned-char -funsigned-bitfields -w -Wno-multichar -Wno-ctor-dtor-privacy -pedantic -Wno-long-long -Woverloaded-virtual -D_BUILDING_CANNALIB -D_WCHAR_T ;
|
||||
|
||||
|
||||
@@ -17,7 +17,8 @@ KernelAddon pci :
|
||||
|
||||
# pci_info.cpp currently needs pcihdr.h so we make its path available and adds dependency
|
||||
ObjectHdrs [ FGristFiles pci_info$(SUFOBJ) ]
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) apps devices ] ;
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) apps
|
||||
devices ] ;
|
||||
Includes [ FGristFiles pci_info.cpp ] : <src!apps!devices>pcihdr.h ;
|
||||
|
||||
SubInclude HAIKU_TOP src add-ons kernel bus_managers pci arch
|
||||
|
||||
@@ -7,9 +7,3 @@ SubDirCcFlags -DBUILD_LOADABLE ;
|
||||
KernelAddon 53c8xx :
|
||||
53c8xx.c
|
||||
;
|
||||
|
||||
Package haiku-53c8xx-cvs
|
||||
:
|
||||
53c8xx
|
||||
:
|
||||
boot home config add-ons kernel busses scsi ;
|
||||
|
||||
@@ -7,9 +7,3 @@ SubDirCcFlags -DBUILD_LOADABLE ;
|
||||
KernelAddon buslogic :
|
||||
buslogic.c
|
||||
;
|
||||
|
||||
Package haiku-buslogic-cvs
|
||||
:
|
||||
buslogic
|
||||
:
|
||||
boot home config add-ons kernel busses scsi ;
|
||||
|
||||
@@ -25,12 +25,3 @@ KernelAddon usb_scsi :
|
||||
# tracing.c
|
||||
# tracing_daemon.c
|
||||
#;
|
||||
|
||||
Package haiku-usb_scsi-cvs
|
||||
:
|
||||
usb_scsi
|
||||
:
|
||||
boot home config add-ons kernel busses scsi ;
|
||||
|
||||
Package haiku-usb_scsi-cvs : <usb_scsi!driver>usb_scsi.settings.sample
|
||||
: boot home config settings kernel drivers sample ;
|
||||
|
||||
@@ -14,11 +14,3 @@ KernelAddon auich :
|
||||
multi.c
|
||||
util.c
|
||||
;
|
||||
|
||||
Package haiku-auich-cvs
|
||||
:
|
||||
auich
|
||||
:
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
|
||||
PackageDriverSymLink haiku-auich-cvs : audio hmulti auich ;
|
||||
|
||||
@@ -14,11 +14,3 @@ KernelAddon auvia :
|
||||
multi.c
|
||||
util.c
|
||||
;
|
||||
|
||||
Package haiku-auvia-cvs
|
||||
:
|
||||
auvia
|
||||
:
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
|
||||
PackageDriverSymLink haiku-auvia-cvs : audio hmulti auvia ;
|
||||
|
||||
@@ -26,10 +26,3 @@ KernelAddon ich_ac97 :
|
||||
# :
|
||||
# -fno-pic -D_KERNEL_MODE
|
||||
# ;
|
||||
|
||||
Package haiku-ich-ac97-cvs :
|
||||
ich_ac97 :
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
PackageDriverSymLink haiku-ich-ac97-cvs : audio multi ich_ac97 ;
|
||||
|
||||
SubInclude HAIKU_TOP src add-ons kernel drivers audio ac97 ich distro ;
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
SubDir HAIKU_TOP src add-ons kernel drivers audio ac97 ich distro ;
|
||||
|
||||
Package haiku-ich-ac97-cvs :
|
||||
README.html install.sh uninstall.sh ;
|
||||
@@ -12,11 +12,3 @@ KernelAddon cmedia :
|
||||
mux.c
|
||||
pcm.c
|
||||
;
|
||||
|
||||
Package haiku-cmedia-cvs
|
||||
:
|
||||
cmedia
|
||||
:
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
|
||||
PackageDriverSymLink haiku-cmedia-cvs : audio cmedia ;
|
||||
|
||||
@@ -80,15 +80,3 @@ SEARCH on [ FGristFiles
|
||||
util.c
|
||||
] = [ FDirName $(HAIKU_TOP) src add-ons kernel drivers audio echo ] ;
|
||||
|
||||
Package haiku-echo24-cvs
|
||||
:
|
||||
echo24
|
||||
:
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
|
||||
PackageDriverSymLink haiku-echo24-cvs : audio hmulti echo24 ;
|
||||
PackageDriverSymLink haiku-echo24-cvs : midi echo24 ;
|
||||
|
||||
Package haiku-echo24-cvs : <echo!driver>echo.settings
|
||||
: boot home config settings kernel drivers ;
|
||||
|
||||
|
||||
@@ -73,16 +73,3 @@ SEARCH on [ FGristFiles
|
||||
multi.cpp
|
||||
util.c
|
||||
] = [ FDirName $(HAIKU_TOP) src add-ons kernel drivers audio echo ] ;
|
||||
|
||||
Package haiku-echo3g-cvs
|
||||
:
|
||||
echo3g
|
||||
:
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
|
||||
PackageDriverSymLink haiku-echo3g-cvs : audio hmulti echo3g ;
|
||||
PackageDriverSymLink haiku-echo3g-cvs : midi echo3g ;
|
||||
|
||||
Package haiku-echo3g-cvs : <echo!driver>echo.settings
|
||||
: boot home config settings kernel drivers ;
|
||||
|
||||
|
||||
@@ -77,16 +77,3 @@ SEARCH on [ FGristFiles
|
||||
multi.cpp
|
||||
util.c
|
||||
] = [ FDirName $(HAIKU_TOP) src add-ons kernel drivers audio echo ] ;
|
||||
|
||||
Package haiku-echogals-cvs
|
||||
:
|
||||
echogals
|
||||
:
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
|
||||
PackageDriverSymLink haiku-echogals-cvs : audio hmulti echogals ;
|
||||
PackageDriverSymLink haiku-echogals-cvs : midi echogals ;
|
||||
|
||||
Package haiku-echogals-cvs : <echo!driver>echo.settings
|
||||
: boot home config settings kernel drivers ;
|
||||
|
||||
|
||||
@@ -71,15 +71,3 @@ SEARCH on [ FGristFiles
|
||||
multi.cpp
|
||||
util.c
|
||||
] = [ FDirName $(HAIKU_TOP) src add-ons kernel drivers audio echo ] ;
|
||||
|
||||
Package haiku-echoindigo-cvs
|
||||
:
|
||||
echoindigo
|
||||
:
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
|
||||
PackageDriverSymLink haiku-echoindigo-cvs : audio hmulti echoindigo ;
|
||||
|
||||
Package haiku-echoindigo-cvs : <echo!driver>echo.settings
|
||||
: boot home config settings kernel drivers ;
|
||||
|
||||
|
||||
@@ -15,15 +15,3 @@ KernelAddon emuxki :
|
||||
util.c
|
||||
# joy.c
|
||||
;
|
||||
|
||||
SEARCH on <emuxki!driver>emuxki.settings = $(SUBDIR) ;
|
||||
|
||||
Package haiku-emuxki-cvs
|
||||
:
|
||||
emuxki
|
||||
:
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
|
||||
PackageDriverSymLink haiku-emuxki-cvs : audio hmulti emuxki ;
|
||||
Package haiku-emuxki-cvs : <emuxki!driver>emuxki.settings
|
||||
: boot home config settings kernel drivers ;
|
||||
|
||||
@@ -11,8 +11,3 @@ KernelAddon hda :
|
||||
hda_controller.cpp
|
||||
hda_codec.cpp
|
||||
;
|
||||
|
||||
Package haiku-hda-cvs :
|
||||
hda :
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
PackageDriverSymLink haiku-hda-cvs : audio multi hda ;
|
||||
|
||||
@@ -10,8 +10,3 @@ KernelAddon sb16 :
|
||||
sb16_hw.c
|
||||
sb16_multi_audio.c
|
||||
;
|
||||
|
||||
Package haiku-sb16-cvs :
|
||||
sb16 :
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
PackageDriverSymLink haiku-sb16-cvs : audio multi sb16 ;
|
||||
|
||||
@@ -28,8 +28,3 @@ KernelAddon h2generic :
|
||||
|
||||
SEARCH on [ FGristFiles $(r5_src)
|
||||
] = [ FDirName $(HAIKU_TOP) src system kernel util ] ;
|
||||
|
||||
Package haiku-h2generic-cvs :
|
||||
h2generic :
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
PackageDriverSymLink haiku-h2generic-cvs : bluetooth h2 h2generic ;
|
||||
|
||||
@@ -145,6 +145,8 @@ nor_read(void *_cookie, off_t position, void *data, size_t *numbytes)
|
||||
nor_driver_info *info = (nor_driver_info*)_cookie;
|
||||
TRACE("read(%Ld,%lu)\n", position, *numbytes);
|
||||
|
||||
position += HIDDEN_BLOCKS * info->blocksize;
|
||||
|
||||
if (position + *numbytes > info->totalsize)
|
||||
*numbytes = info->totalsize - (position + *numbytes);
|
||||
|
||||
|
||||
@@ -20,8 +20,3 @@ KernelAddon intel_extreme :
|
||||
SEARCH on [ FGristFiles
|
||||
kernel_cpp.cpp
|
||||
] = [ FDirName $(HAIKU_TOP) src system kernel util ] ;
|
||||
|
||||
Package haiku-intel_extreme-cvs :
|
||||
intel_extreme :
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
PackageDriverSymLink haiku-intel_extreme-cvs : graphics intel_extreme ;
|
||||
|
||||
@@ -9,13 +9,3 @@ UsePrivateHeaders [ FDirName graphics matrox ] ;
|
||||
KernelAddon matrox :
|
||||
driver.c
|
||||
;
|
||||
|
||||
Package haiku-matrox-cvs :
|
||||
README.html UPDATE.html ;
|
||||
Package haiku-matrox-cvs :
|
||||
matrox :
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
PackageDriverSymLink haiku-matrox-cvs : graphics matrox ;
|
||||
Package haiku-matrox-cvs :
|
||||
matrox.settings :
|
||||
boot home config settings kernel drivers ;
|
||||
|
||||
@@ -9,14 +9,3 @@ UsePrivateHeaders [ FDirName graphics neomagic ] ;
|
||||
KernelAddon neomagic :
|
||||
driver.c
|
||||
;
|
||||
|
||||
Package haiku-neomagic-cvs :
|
||||
README.html UPDATE.html ;
|
||||
Package haiku-neomagic-cvs :
|
||||
neomagic :
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
PackageDriverSymLink haiku-neomagic-cvs : graphics neomagic ;
|
||||
Package haiku-neomagic-cvs :
|
||||
neomagic.settings :
|
||||
boot home config settings kernel drivers ;
|
||||
|
||||
|
||||
@@ -10,14 +10,3 @@ UsePrivateHeaders [ FDirName graphics common ] ;
|
||||
KernelAddon nvidia :
|
||||
driver.c
|
||||
;
|
||||
|
||||
Package haiku-nvidia-cvs :
|
||||
README.html UPDATE.html ;
|
||||
Package haiku-nvidia-cvs :
|
||||
nvidia :
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
PackageDriverSymLink haiku-nvidia-cvs : graphics nvidia ;
|
||||
Package haiku-nvidia-cvs :
|
||||
nvidia.settings :
|
||||
boot home config settings kernel drivers ;
|
||||
|
||||
|
||||
@@ -8,14 +8,3 @@ UsePrivateHeaders [ FDirName graphics nvidia_gpgpu ] ;
|
||||
KernelAddon nvidia_gpgpu :
|
||||
driver.c
|
||||
;
|
||||
|
||||
Package haiku-nvidia_gpgpu-cvs :
|
||||
README.html UPDATE.html ;
|
||||
Package haiku-nvidia_gpgpu-cvs :
|
||||
nvidia_gpgpu :
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
PackageDriverSymLink haiku-nvidia_gpgpu-cvs : graphics nvidia_gpgpu ;
|
||||
Package haiku-nvidia_gpgpu-cvs :
|
||||
nvidia_gpgpu.settings :
|
||||
boot home config settings kernel drivers ;
|
||||
|
||||
|
||||
@@ -26,14 +26,3 @@ KernelAddon radeon :
|
||||
vip.c
|
||||
: libgraphicscommon.a libradeon.a
|
||||
;
|
||||
|
||||
#Package haiku-radeon-cvs :
|
||||
# README.html UPDATE.html ;
|
||||
Package haiku-radeon-cvs :
|
||||
radeon :
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
PackageDriverSymLink haiku-radeon-cvs : graphics radeon ;
|
||||
#Package haiku-radeon-cvs :
|
||||
# radeon.settings :
|
||||
# boot home config settings kernel drivers ;
|
||||
|
||||
|
||||
@@ -19,8 +19,3 @@ KernelAddon radeon_hd :
|
||||
SEARCH on [ FGristFiles
|
||||
kernel_cpp.cpp
|
||||
] = [ FDirName $(HAIKU_TOP) src system kernel util ] ;
|
||||
|
||||
Package haiku-radeon_hd-cvs :
|
||||
radeon_hd :
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
PackageDriverSymLink haiku-radeon_hd-cvs : graphics radeon_hd ;
|
||||
|
||||
@@ -9,8 +9,3 @@ UsePrivateHeaders graphics kernel ;
|
||||
KernelAddon s3 :
|
||||
driver.cpp
|
||||
;
|
||||
|
||||
Package haiku-s3-cvs :
|
||||
s3 :
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
PackageDriverSymLink haiku-s3-cvs : graphics s3 ;
|
||||
|
||||
@@ -8,14 +8,3 @@ UsePrivateHeaders [ FDirName graphics skeleton ] ;
|
||||
KernelAddon skel.driver :
|
||||
driver.c
|
||||
;
|
||||
|
||||
Package haiku-skeleton-cvs :
|
||||
README.html UPDATE.html ;
|
||||
Package haiku-skeleton-cvs :
|
||||
skel.driver :
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
PackageDriverSymLink haiku-skeleton-cvs : graphics skel.driver ;
|
||||
Package haiku-skeleton-cvs :
|
||||
skel.settings :
|
||||
boot home config settings kernel drivers ;
|
||||
|
||||
|
||||
@@ -8,14 +8,3 @@ UsePrivateHeaders [ FDirName graphics via ] ;
|
||||
KernelAddon via :
|
||||
driver.c
|
||||
;
|
||||
|
||||
Package haiku-via_gfx-cvs :
|
||||
README.html UPDATE.html ;
|
||||
Package haiku-via_gfx-cvs :
|
||||
via :
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
PackageDriverSymLink haiku-via_gfx-cvs : graphics via ;
|
||||
Package haiku-via_gfx-cvs :
|
||||
via.settings :
|
||||
boot home config settings kernel drivers ;
|
||||
|
||||
|
||||
@@ -14,8 +14,3 @@ KernelAddon vmware :
|
||||
if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
|
||||
LinkAgainst vmware : $(TARGET_HAIKU_COMPATIBILITY_LIBS) ;
|
||||
}
|
||||
|
||||
Package haiku-vmware-video-svn :
|
||||
vmware :
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
PackageDriverSymLink haiku-vmware-video-svn : graphics vmware ;
|
||||
|
||||
@@ -7,10 +7,3 @@ SubDirSysHdrs $(HAIKU_TOP) headers os drivers ;
|
||||
KernelAddon wacom :
|
||||
wacom.c
|
||||
;
|
||||
|
||||
Package haiku-inputkit-cvs :
|
||||
wacpm :
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
|
||||
PackageDriverSymLink haiku-inputkit-cvs : input wacom ;
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ KernelStaticLibrary 3com_mii.a
|
||||
;
|
||||
|
||||
ObjectHdrs [ FGristFiles bmtphy$(SUFOBJ) ukphy$(SUFOBJ) ]
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) libs compat
|
||||
freebsd_network ] ;
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
|
||||
compat freebsd_network ] ;
|
||||
Includes [ FGristFiles bmtphy.c ukphy.c ]
|
||||
: <src!libs!compat!freebsd_network>miidevs.h ;
|
||||
|
||||
@@ -16,7 +16,7 @@ KernelAddon 3com :
|
||||
;
|
||||
|
||||
ObjectHdrs [ FGristFiles xlphy$(SUFOBJ) ]
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) libs compat
|
||||
freebsd_network ] ;
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
|
||||
compat freebsd_network ] ;
|
||||
Includes [ FGristFiles xlphy.c ]
|
||||
: <src!libs!compat!freebsd_network>miidevs.h ;
|
||||
|
||||
@@ -14,7 +14,7 @@ KernelStaticLibrary atl1_mii.a
|
||||
;
|
||||
|
||||
ObjectHdrs [ FGristFiles atphy$(SUFOBJ) ]
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) libs compat
|
||||
freebsd_network ] ;
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
|
||||
compat freebsd_network ] ;
|
||||
Includes [ FGristFiles atphy.c ]
|
||||
: <src!libs!compat!freebsd_network>miidevs.h ;
|
||||
|
||||
@@ -13,10 +13,6 @@ KernelAddon bcm440x :
|
||||
mempool.c
|
||||
;
|
||||
|
||||
Package haiku-networkingkit-cvs :
|
||||
bcm440x :
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
PackageDriverSymLink haiku-networkingkit-cvs : net bcm440x ;
|
||||
|
||||
# Installation
|
||||
|
||||
|
||||
@@ -14,11 +14,6 @@ KernelAddon bcm570x :
|
||||
mempool.c
|
||||
;
|
||||
|
||||
Package haiku-networkingkit-cvs :
|
||||
bcm570x :
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
PackageDriverSymLink haiku-networkingkit-cvs : net bcm570x ;
|
||||
|
||||
|
||||
# Installation
|
||||
|
||||
|
||||
@@ -14,5 +14,6 @@ KernelStaticLibrary broadcom440x_mii.a
|
||||
;
|
||||
|
||||
ObjectHdrs [ FGristFiles bmtphy$(SUFOBJ) ]
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) libs compat freebsd_network ] ;
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
|
||||
compat freebsd_network ] ;
|
||||
Includes [ FGristFiles bmtphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;
|
||||
@@ -16,5 +16,6 @@ KernelAddon broadcom570x :
|
||||
;
|
||||
|
||||
ObjectHdrs [ FGristFiles if_bge$(SUFOBJ) ]
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) libs compat freebsd_network ] ;
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
|
||||
compat freebsd_network ] ;
|
||||
Includes [ FGristFiles if_bge.c ] : <src!libs!compat!freebsd_network>miidevs.h ;
|
||||
|
||||
@@ -16,5 +16,6 @@ KernelStaticLibrary broadcom570x_mii.a
|
||||
;
|
||||
|
||||
ObjectHdrs [ FGristFiles brgphy$(SUFOBJ) ]
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) libs compat freebsd_network ] ;
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
|
||||
compat freebsd_network ] ;
|
||||
Includes [ FGristFiles brgphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;
|
||||
|
||||
@@ -18,6 +18,7 @@ KernelAddon dec21xxx :
|
||||
;
|
||||
|
||||
ObjectHdrs [ FGristFiles dcphy$(SUFOBJ) pnphy$(SUFOBJ) ]
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) libs compat freebsd_network ] ;
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
|
||||
compat freebsd_network ] ;
|
||||
Includes [ FGristFiles dcphy.c pnphy.c ]
|
||||
: <src!libs!compat!freebsd_network>miidevs.h ;
|
||||
|
||||
@@ -15,4 +15,5 @@ KernelStaticLibrary dec21xxx_de.a
|
||||
;
|
||||
|
||||
ObjectHdrs [ FGristFiles if_de$(SUFOBJ) ]
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) libs compat freebsd_network ] ;
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
|
||||
compat freebsd_network ] ;
|
||||
|
||||
@@ -18,6 +18,7 @@ KernelStaticLibrary dec21xxx_mii.a
|
||||
;
|
||||
|
||||
ObjectHdrs [ FGristFiles acphy$(SUFOBJ) amphy$(SUFOBJ) ukphy$(SUFOBJ) ]
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) libs compat freebsd_network ] ;
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
|
||||
compat freebsd_network ] ;
|
||||
Includes [ FGristFiles acphy.c amphy.c amphy.c ]
|
||||
: <src!libs!compat!freebsd_network>miidevs.h ;
|
||||
|
||||
@@ -10,16 +10,6 @@ KernelAddon dp83815 :
|
||||
util.c
|
||||
;
|
||||
|
||||
Package haiku-dp83815-cvs :
|
||||
dp83815 :
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
PackageDriverSymLink haiku-dp83815-cvs : net dp83815 ;
|
||||
|
||||
# Package haiku-dp83815-cvs :
|
||||
# dp83815.settings :
|
||||
# boot home config settings kernel drivers sample ;
|
||||
|
||||
|
||||
|
||||
rule Installdp83815
|
||||
{
|
||||
@@ -43,14 +33,3 @@ HaikuInstallRelSymLink install-networking : /boot/home/config/add-ons/kernel/dri
|
||||
<installed>dp83815 :
|
||||
installed-symlink
|
||||
;
|
||||
|
||||
Package haiku-networkingkit-cvs :
|
||||
dp83815 :
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
PackageDriverSymLink haiku-networkingkit-cvs : net dp83815 ;
|
||||
|
||||
# Package haiku-networkingkit-cvs :
|
||||
# dp83815.settings :
|
||||
# boot home config settings kernel drivers sample ;
|
||||
|
||||
|
||||
|
||||
@@ -9,11 +9,6 @@ KernelAddon etherpci :
|
||||
etherpci.c
|
||||
;
|
||||
|
||||
Package haiku-networkingkit-cvs :
|
||||
etherpci :
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
PackageDriverSymLink haiku-networkingkit-cvs : net etherpci ;
|
||||
|
||||
|
||||
# Installation
|
||||
|
||||
|
||||
@@ -16,5 +16,6 @@ KernelAddon ipro100 :
|
||||
;
|
||||
|
||||
ObjectHdrs [ FGristFiles inphy$(SUFOBJ) ]
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) libs compat freebsd_network ] ;
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
|
||||
compat freebsd_network ] ;
|
||||
Includes [ FGristFiles inphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;
|
||||
|
||||
@@ -17,12 +17,6 @@ KernelAddon beos_ipro1000 :
|
||||
util.c
|
||||
;
|
||||
|
||||
Package haiku-networkingkit-cvs : beos_ipro1000 :
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
PackageDriverSymLink haiku-networkingkit-cvs : net beos_ipro1000 ;
|
||||
Package haiku-networkingkit-cvs : ipro1000.settings :
|
||||
boot home config settings kernel drivers sample ;
|
||||
|
||||
# Installation
|
||||
|
||||
HaikuInstall install-networking : /boot/home/config/add-ons/kernel/drivers/bin :
|
||||
|
||||
@@ -14,5 +14,6 @@ KernelStaticLibrary jmicron2x0_mii.a
|
||||
;
|
||||
|
||||
ObjectHdrs [ FGristFiles jmphy$(SUFOBJ) ]
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) libs compat freebsd_network ] ;
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
|
||||
compat freebsd_network ] ;
|
||||
Includes [ FGristFiles jmphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;
|
||||
|
||||
@@ -16,5 +16,6 @@ KernelStaticLibrary marvell_yukon_mii.a
|
||||
;
|
||||
|
||||
ObjectHdrs [ FGristFiles e1000phy$(SUFOBJ) ]
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) libs compat freebsd_network ] ;
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
|
||||
compat freebsd_network ] ;
|
||||
Includes [ FGristFiles e1000phy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;
|
||||
|
||||
@@ -16,5 +16,6 @@ KernelStaticLibrary nforce_mii.a
|
||||
;
|
||||
|
||||
ObjectHdrs [ FGristFiles ciphy$(SUFOBJ) ]
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) libs compat freebsd_network ] ;
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
|
||||
compat freebsd_network ] ;
|
||||
Includes [ FGristFiles ciphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;
|
||||
|
||||
@@ -15,5 +15,6 @@ KernelAddon pegasus :
|
||||
|
||||
# driver.c currently needs usbdevs.h so we make its path available and adds dependency
|
||||
ObjectHdrs [ FGristFiles driver$(SUFOBJ) if_aue$(SUFOBJ) ]
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) apps devices ] ;
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) apps
|
||||
devices ] ;
|
||||
Includes [ FGristFiles driver.c if_aue.c ] : <src!apps!devices>usbdevs.h ;
|
||||
|
||||
@@ -14,5 +14,6 @@ KernelStaticLibrary rdc_mii.a
|
||||
;
|
||||
|
||||
ObjectHdrs [ FGristFiles rdcphy$(SUFOBJ) ]
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) libs compat freebsd_network ] ;
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
|
||||
compat freebsd_network ] ;
|
||||
Includes [ FGristFiles rdcphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;
|
||||
|
||||
@@ -13,6 +13,7 @@ KernelStaticLibrary rtl8139_mii.a :
|
||||
rlphy.c
|
||||
;
|
||||
|
||||
ObjectHdrs [ FGristFiles rlphy$(SUFOBJ) ] : [ FDirName
|
||||
$(TARGET_COMMON_DEBUG_OBJECT_DIR) libs compat freebsd_network ] ;
|
||||
ObjectHdrs [ FGristFiles rlphy$(SUFOBJ) ]
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
|
||||
compat freebsd_network ] ;
|
||||
Includes [ FGristFiles rlphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;
|
||||
|
||||
@@ -12,22 +12,6 @@ KernelAddon rtl8169 :
|
||||
util.c
|
||||
;
|
||||
|
||||
Package haiku-rtl8169-svn :
|
||||
rtl8169 :
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
Package haiku-rtl8169-svn :
|
||||
rtl8169.settings :
|
||||
boot home config settings kernel drivers sample ;
|
||||
PackageDriverSymLink haiku-rtl8169-svn : net rtl8169 ;
|
||||
|
||||
Package haiku-networkingkit-cvs :
|
||||
rtl8169 :
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
PackageDriverSymLink haiku-networkingkit-cvs : net rtl8169 ;
|
||||
Package haiku-networkingkit-cvs :
|
||||
rtl8169.settings :
|
||||
boot home config settings kernel drivers sample ;
|
||||
|
||||
|
||||
# Installation
|
||||
|
||||
|
||||
@@ -17,7 +17,8 @@ KernelStaticLibrary rtl81xx_mii.a :
|
||||
SEARCH on [ FGristFiles rlphy.c ] = [ FDirName $(HAIKU_TOP) src add-ons kernel
|
||||
drivers network rtl8139 dev mii ] ;
|
||||
|
||||
ObjectHdrs [ FGristFiles rgephy$(SUFOBJ) rlphy$(SUFOBJ) ] : [ FDirName
|
||||
$(TARGET_COMMON_DEBUG_OBJECT_DIR) libs compat freebsd_network ] ;
|
||||
ObjectHdrs [ FGristFiles rgephy$(SUFOBJ) rlphy$(SUFOBJ) ]
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
|
||||
compat freebsd_network ] ;
|
||||
Includes [ FGristFiles rgephy.c rlphy.c ]
|
||||
: <src!libs!compat!freebsd_network>miidevs.h ;
|
||||
|
||||
@@ -14,23 +14,6 @@ KernelAddon sis900 :
|
||||
sis900.c
|
||||
;
|
||||
|
||||
Package haiku-sis900-cvs :
|
||||
sis900 :
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
PackageDriverSymLink haiku-sis900-cvs : net sis900 ;
|
||||
Package haiku-sis900-cvs :
|
||||
sis900.settings :
|
||||
boot home config settings kernel drivers sample ;
|
||||
|
||||
Package haiku-networkingkit-cvs :
|
||||
sis900 :
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
PackageDriverSymLink haiku-networkingkit-cvs : net sis900 ;
|
||||
Package haiku-networkingkit-cvs :
|
||||
sis900.settings :
|
||||
boot home config settings kernel drivers sample ;
|
||||
|
||||
|
||||
|
||||
rule InstallSiS900
|
||||
{
|
||||
|
||||
@@ -17,6 +17,7 @@ KernelStaticLibrary syskonnect_mii.a
|
||||
;
|
||||
|
||||
ObjectHdrs [ FGristFiles e1000phy$(SUFOBJ) ukphy$(SUFOBJ) xmphy$(SUFOBJ) ]
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) libs compat freebsd_network ] ;
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
|
||||
compat freebsd_network ] ;
|
||||
Includes [ FGristFiles e1000phy.c ukphy.c xmphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;
|
||||
|
||||
|
||||
@@ -16,6 +16,7 @@ KernelStaticLibrary via_rhine_mii.a
|
||||
;
|
||||
|
||||
ObjectHdrs [ FGristFiles ciphy$(SUFOBJ) ukphy$(SUFOBJ) ]
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) libs compat freebsd_network ] ;
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
|
||||
compat freebsd_network ] ;
|
||||
Includes [ FGristFiles ciphy.c ukphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;
|
||||
|
||||
|
||||
@@ -16,6 +16,7 @@ KernelStaticLibrary vt612x_mii.a
|
||||
;
|
||||
|
||||
ObjectHdrs [ FGristFiles ciphy$(SUFOBJ) ukphy$(SUFOBJ) ]
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) libs compat freebsd_network ] ;
|
||||
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
|
||||
compat freebsd_network ] ;
|
||||
Includes [ FGristFiles ciphy.c ukphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;
|
||||
|
||||
|
||||
@@ -13,23 +13,6 @@ KernelAddon wb840 :
|
||||
wb840.c
|
||||
;
|
||||
|
||||
Package haiku-wb840-cvs :
|
||||
wb840 :
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
PackageDriverSymLink haiku-wb840-cvs : net wb840 ;
|
||||
# Package haiku-wb840-cvs :
|
||||
# wb840.settings :
|
||||
# boot home config settings kernel drivers sample ;
|
||||
|
||||
Package haiku-networkingkit-cvs :
|
||||
wb840 :
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
PackageDriverSymLink haiku-networkingkit-cvs : net wb840 ;
|
||||
#Package haiku-networkingkit-cvs :
|
||||
# wb840.settings :
|
||||
# boot home config settings kernel drivers sample ;
|
||||
|
||||
|
||||
|
||||
rule Installwb840
|
||||
{
|
||||
|
||||
@@ -8,14 +8,6 @@ KernelAddon ipw2100 :
|
||||
kernel_cpp.c
|
||||
;
|
||||
|
||||
Package haiku-ipw2100-cvs :
|
||||
ipw2100 :
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
Package haiku-ipw2100-cvs :
|
||||
ipw2100.settings :
|
||||
boot home config settings kernel drivers sample ;
|
||||
PackageDriverSymLink haiku-ipw2100-cvs : net ipw2100 ;
|
||||
|
||||
# Note: Due to licensing restrictions, we can only distribute the archive.
|
||||
# The end-user must extract and install it themselves.
|
||||
HAIKU_WIFI_FIRMWARE_PACKAGE on ipw2100 = "" ;
|
||||
|
||||
@@ -17,13 +17,3 @@ KernelAddon pc_serial :
|
||||
;
|
||||
|
||||
#AddResources pc_serial : pc_serial.rdef ;
|
||||
|
||||
|
||||
#Package haiku-pc_serial-cvs
|
||||
# :
|
||||
# pc_serial
|
||||
# :
|
||||
# boot home config add-ons kernel drivers bin ;
|
||||
#
|
||||
#Package haiku-pc_serial-cvs : <pc_serial!driver>pc_serial.settings.sample
|
||||
# : boot home config settings kernel drivers sample ;
|
||||
|
||||
@@ -11,14 +11,3 @@ KernelAddon usb_vision :
|
||||
usb_vision.c
|
||||
tracing.c
|
||||
;
|
||||
|
||||
# driver goes in dev/video
|
||||
|
||||
Package haiku-usb_vision-cvs
|
||||
:
|
||||
usb_vision
|
||||
:
|
||||
boot home config add-ons kernel drivers bin ;
|
||||
|
||||
Package haiku-usb_vision-cvs : <usb_vision!driver>usb_vision.settings.sample
|
||||
: boot home config settings kernel drivers sample ;
|
||||
|
||||
@@ -16,7 +16,7 @@ HAIKU_BIND_FS_SOURCES =
|
||||
KernelAddon bindfs
|
||||
:
|
||||
$(HAIKU_BIND_FS_SOURCES)
|
||||
: $(HAIKU_KERNEL_LIBSUPC++)
|
||||
: $(TARGET_KERNEL_LIBSUPC++)
|
||||
;
|
||||
|
||||
|
||||
|
||||
@@ -40,7 +40,6 @@ Volume::Volume(fs_volume* fsVolume)
|
||||
|
||||
Volume::~Volume()
|
||||
{
|
||||
delete fRootNode;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
SubDir HAIKU_TOP src add-ons kernel file_systems btrfs ;
|
||||
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers libs zlib ] ;
|
||||
|
||||
UsePrivateHeaders [ FDirName kernel util ] ;
|
||||
UsePrivateHeaders shared storage ;
|
||||
UsePrivateKernelHeaders ;
|
||||
SubDirSysHdrs $(HAIKU_TOP) headers libs zlib ;
|
||||
UseBuildFeatureHeaders zlib ;
|
||||
|
||||
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src libs zlib ] ;
|
||||
Includes [ FGristFiles Inode.cpp ]
|
||||
: [ BuildFeatureAttribute zlib : headers ] ;
|
||||
|
||||
KernelAddon btrfs :
|
||||
kernel_interface.cpp
|
||||
@@ -19,11 +18,5 @@ KernelAddon btrfs :
|
||||
DirectoryIterator.cpp
|
||||
Inode.cpp
|
||||
Volume.cpp
|
||||
|
||||
inflate.c
|
||||
inffast.c
|
||||
inftrees.c
|
||||
adler32.c
|
||||
crc32.c
|
||||
zutil.c
|
||||
: kernel_libz.a
|
||||
;
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
/*
|
||||
* Copyright 2009, Ingo Weinhold, [email protected].
|
||||
* Distributed under the terms of the MIT License.
|
||||
*/
|
||||
|
||||
|
||||
#include "BlockBufferCacheKernel.h"
|
||||
|
||||
|
||||
BlockBufferCacheKernel::BlockBufferCacheKernel(size_t blockSize,
|
||||
uint32 maxCachedBlocks)
|
||||
:
|
||||
BlockBufferCacheImpl(blockSize, maxCachedBlocks, this)
|
||||
{
|
||||
mutex_init(&fLock, "BlockBufferCache");
|
||||
}
|
||||
|
||||
|
||||
BlockBufferCacheKernel::~BlockBufferCacheKernel()
|
||||
{
|
||||
mutex_destroy(&fLock);
|
||||
}
|
||||
|
||||
|
||||
bool
|
||||
BlockBufferCacheKernel::Lock()
|
||||
{
|
||||
mutex_lock(&fLock);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
BlockBufferCacheKernel::Unlock()
|
||||
{
|
||||
mutex_unlock(&fLock);
|
||||
}
|
||||
@@ -1,34 +0,0 @@
|
||||
/*
|
||||
* Copyright 2009, Ingo Weinhold, [email protected].
|
||||
* Distributed under the terms of the MIT License.
|
||||
*/
|
||||
#ifndef BLOCK_BUFFER_CACHE_KERNEL_H
|
||||
#define BLOCK_BUFFER_CACHE_KERNEL_H
|
||||
|
||||
|
||||
#include <lock.h>
|
||||
|
||||
#include <package/hpkg/BlockBufferCacheImpl.h>
|
||||
#include <package/hpkg/BufferCache.h>
|
||||
|
||||
|
||||
using BPackageKit::BHPKG::BBufferCacheLockable;
|
||||
using BPackageKit::BHPKG::BPrivate::BlockBufferCacheImpl;
|
||||
|
||||
|
||||
class BlockBufferCacheKernel
|
||||
: public BlockBufferCacheImpl, BBufferCacheLockable {
|
||||
public:
|
||||
BlockBufferCacheKernel(size_t blockSize,
|
||||
uint32 maxCachedBlocks);
|
||||
virtual ~BlockBufferCacheKernel();
|
||||
|
||||
virtual bool Lock();
|
||||
virtual void Unlock();
|
||||
|
||||
private:
|
||||
mutex fLock;
|
||||
};
|
||||
|
||||
|
||||
#endif // BLOCK_BUFFER_CACHE_KERNEL_H
|
||||
@@ -1,9 +1,21 @@
|
||||
SubDir HAIKU_TOP src add-ons kernel file_systems packagefs ;
|
||||
|
||||
|
||||
UseLibraryHeaders zlib ;
|
||||
UseBuildFeatureHeaders zlib ;
|
||||
UsePrivateKernelHeaders ;
|
||||
UsePrivateHeaders shared storage ;
|
||||
UsePrivateHeaders package shared storage ;
|
||||
|
||||
|
||||
local subDirs =
|
||||
indices
|
||||
nodes
|
||||
package
|
||||
package_links
|
||||
resolvables
|
||||
util
|
||||
volume
|
||||
;
|
||||
SEARCH_SOURCE += $(subDirs:D=$(SUBDIR)) ;
|
||||
|
||||
|
||||
HAIKU_PACKAGE_FS_SOURCES =
|
||||
@@ -11,7 +23,8 @@ HAIKU_PACKAGE_FS_SOURCES =
|
||||
AttributeDirectoryCookie.cpp
|
||||
AttributeIndex.cpp
|
||||
AutoPackageAttributes.cpp
|
||||
BlockBufferCacheKernel.cpp
|
||||
BlockBufferPoolKernel.cpp
|
||||
CachedDataReader.cpp
|
||||
DebugSupport.cpp
|
||||
Dependency.cpp
|
||||
Directory.cpp
|
||||
@@ -28,7 +41,6 @@ HAIKU_PACKAGE_FS_SOURCES =
|
||||
Query.cpp
|
||||
Package.cpp
|
||||
PackageDirectory.cpp
|
||||
PackageDomain.cpp
|
||||
PackageFile.cpp
|
||||
PackageFSRoot.cpp
|
||||
PackageLeafNode.cpp
|
||||
@@ -42,6 +54,9 @@ HAIKU_PACKAGE_FS_SOURCES =
|
||||
Resolvable.cpp
|
||||
ResolvableFamily.cpp
|
||||
SizeIndex.cpp
|
||||
String.cpp
|
||||
StringConstants.cpp
|
||||
StringPool.cpp
|
||||
UnpackingAttributeCookie.cpp
|
||||
UnpackingAttributeDirectoryCookie.cpp
|
||||
UnpackingDirectory.cpp
|
||||
@@ -56,18 +71,21 @@ HAIKU_PACKAGE_FS_SHARED_SOURCES =
|
||||
;
|
||||
|
||||
HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES =
|
||||
BlockBufferCacheImpl.cpp
|
||||
BufferCache.cpp
|
||||
CachedBuffer.cpp
|
||||
BlockBufferPoolImpl.cpp
|
||||
BufferPool.cpp
|
||||
DataOutput.cpp
|
||||
DataReader.cpp
|
||||
ErrorOutput.cpp
|
||||
FDDataReader.cpp
|
||||
HPKGDefs.cpp
|
||||
PoolBuffer.cpp
|
||||
PackageContentHandler.cpp
|
||||
PackageData.cpp
|
||||
PackageDataReader.cpp
|
||||
PackageEntry.cpp
|
||||
PackageEntryAttribute.cpp
|
||||
PackageFileHeapAccessorBase.cpp
|
||||
PackageFileHeapReader.cpp
|
||||
PackageReaderImpl.cpp
|
||||
ReaderImplBase.cpp
|
||||
|
||||
@@ -76,6 +94,21 @@ HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES =
|
||||
ZlibDecompressor.cpp
|
||||
;
|
||||
|
||||
HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES_V1 =
|
||||
HPKGDefsV1.cpp
|
||||
PackageContentHandlerV1.cpp
|
||||
PackageDataV1.cpp
|
||||
PackageDataReaderV1.cpp
|
||||
PackageEntryV1.cpp
|
||||
PackageEntryAttributeV1.cpp
|
||||
PackageReaderImplV1.cpp
|
||||
ReaderImplBaseV1.cpp
|
||||
;
|
||||
|
||||
Includes
|
||||
[ FGristFiles $(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES)
|
||||
$(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES_V1) ]
|
||||
: [ BuildFeatureAttribute zlib : headers ] ;
|
||||
|
||||
local libSharedSources =
|
||||
NaturalCompare.cpp
|
||||
@@ -87,9 +120,10 @@ KernelAddon packagefs
|
||||
$(HAIKU_PACKAGE_FS_SOURCES)
|
||||
$(HAIKU_PACKAGE_FS_SHARED_SOURCES)
|
||||
$(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES)
|
||||
$(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES_V1)
|
||||
$(libSharedSources)
|
||||
|
||||
: $(HAIKU_KERNEL_LIBSUPC++) libz.a
|
||||
: $(TARGET_KERNEL_LIBSUPC++) kernel_libz.a
|
||||
;
|
||||
|
||||
|
||||
@@ -97,8 +131,7 @@ SEARCH on [ FGristFiles $(HAIKU_PACKAGE_FS_SHARED_SOURCES) ]
|
||||
+= [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems shared ] ;
|
||||
SEARCH on [ FGristFiles $(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES) ]
|
||||
+= [ FDirName $(HAIKU_TOP) src kits package hpkg ] ;
|
||||
SEARCH on [ FGristFiles $(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES_V1) ]
|
||||
+= [ FDirName $(HAIKU_TOP) src kits package hpkg v1 ] ;
|
||||
SEARCH on [ FGristFiles $(libSharedSources) ]
|
||||
+= [ FDirName $(HAIKU_TOP) src kits shared ] ;
|
||||
|
||||
|
||||
HaikuSubInclude userland ;
|
||||
|
||||
@@ -1,199 +0,0 @@
|
||||
/*
|
||||
* Copyright 2009-2011, Ingo Weinhold, [email protected].
|
||||
* Distributed under the terms of the MIT License.
|
||||
*/
|
||||
|
||||
|
||||
#include "Package.h"
|
||||
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <util/AutoLock.h>
|
||||
|
||||
#include "DebugSupport.h"
|
||||
#include "PackageDomain.h"
|
||||
#include "Version.h"
|
||||
|
||||
|
||||
const char* const kArchitectureNames[B_PACKAGE_ARCHITECTURE_ENUM_COUNT] = {
|
||||
"any",
|
||||
"x86",
|
||||
"x86_gcc2",
|
||||
};
|
||||
|
||||
|
||||
Package::Package(PackageDomain* domain, dev_t deviceID, ino_t nodeID)
|
||||
:
|
||||
fDomain(domain),
|
||||
fFileName(NULL),
|
||||
fName(NULL),
|
||||
fInstallPath(NULL),
|
||||
fVersion(NULL),
|
||||
fArchitecture(B_PACKAGE_ARCHITECTURE_ENUM_COUNT),
|
||||
fLinkDirectory(NULL),
|
||||
fFD(-1),
|
||||
fOpenCount(0),
|
||||
fNodeID(nodeID),
|
||||
fDeviceID(deviceID)
|
||||
{
|
||||
mutex_init(&fLock, "packagefs package");
|
||||
}
|
||||
|
||||
|
||||
Package::~Package()
|
||||
{
|
||||
while (PackageNode* node = fNodes.RemoveHead())
|
||||
node->ReleaseReference();
|
||||
|
||||
while (Resolvable* resolvable = fResolvables.RemoveHead())
|
||||
delete resolvable;
|
||||
|
||||
while (Dependency* dependency = fDependencies.RemoveHead())
|
||||
delete dependency;
|
||||
|
||||
free(fFileName);
|
||||
free(fName);
|
||||
free(fInstallPath);
|
||||
delete fVersion;
|
||||
|
||||
mutex_destroy(&fLock);
|
||||
}
|
||||
|
||||
|
||||
status_t
|
||||
Package::Init(const char* fileName)
|
||||
{
|
||||
fFileName = strdup(fileName);
|
||||
if (fFileName == NULL)
|
||||
RETURN_ERROR(B_NO_MEMORY);
|
||||
|
||||
return B_OK;
|
||||
}
|
||||
|
||||
|
||||
status_t
|
||||
Package::SetName(const char* name)
|
||||
{
|
||||
if (fName != NULL)
|
||||
free(fName);
|
||||
|
||||
fName = strdup(name);
|
||||
if (fName == NULL)
|
||||
RETURN_ERROR(B_NO_MEMORY);
|
||||
|
||||
return B_OK;
|
||||
}
|
||||
|
||||
|
||||
status_t
|
||||
Package::SetInstallPath(const char* installPath)
|
||||
{
|
||||
if (fInstallPath != NULL)
|
||||
free(fInstallPath);
|
||||
|
||||
fInstallPath = strdup(installPath);
|
||||
if (fInstallPath == NULL)
|
||||
RETURN_ERROR(B_NO_MEMORY);
|
||||
|
||||
return B_OK;
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
Package::SetVersion(::Version* version)
|
||||
{
|
||||
if (fVersion != NULL)
|
||||
delete fVersion;
|
||||
|
||||
fVersion = version;
|
||||
}
|
||||
|
||||
|
||||
const char*
|
||||
Package::ArchitectureName() const
|
||||
{
|
||||
if (fArchitecture < 0
|
||||
|| fArchitecture >= B_PACKAGE_ARCHITECTURE_ENUM_COUNT) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return kArchitectureNames[fArchitecture];
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
Package::AddNode(PackageNode* node)
|
||||
{
|
||||
fNodes.Add(node);
|
||||
node->AcquireReference();
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
Package::AddResolvable(Resolvable* resolvable)
|
||||
{
|
||||
fResolvables.Add(resolvable);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
Package::AddDependency(Dependency* dependency)
|
||||
{
|
||||
fDependencies.Add(dependency);
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
Package::Open()
|
||||
{
|
||||
MutexLocker locker(fLock);
|
||||
if (fOpenCount > 0) {
|
||||
fOpenCount++;
|
||||
return fFD;
|
||||
}
|
||||
|
||||
// open the file
|
||||
fFD = openat(fDomain->DirectoryFD(), fFileName, O_RDONLY);
|
||||
if (fFD < 0) {
|
||||
ERROR("Failed to open package file \"%s\"\n", fFileName);
|
||||
return errno;
|
||||
}
|
||||
|
||||
// stat it to verify that it's still the same file
|
||||
struct stat st;
|
||||
if (fstat(fFD, &st) < 0) {
|
||||
ERROR("Failed to stat package file \"%s\"\n", fFileName);
|
||||
close(fFD);
|
||||
fFD = -1;
|
||||
return errno;
|
||||
}
|
||||
|
||||
if (st.st_dev != fDeviceID || st.st_ino != fNodeID) {
|
||||
close(fFD);
|
||||
fFD = -1;
|
||||
RETURN_ERROR(B_ENTRY_NOT_FOUND);
|
||||
}
|
||||
|
||||
fOpenCount = 1;
|
||||
return fFD;
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
Package::Close()
|
||||
{
|
||||
MutexLocker locker(fLock);
|
||||
if (fOpenCount == 0) {
|
||||
ERROR("Package open count already 0!\n");
|
||||
return;
|
||||
}
|
||||
|
||||
if (--fOpenCount == 0) {
|
||||
close(fFD);
|
||||
fFD = -1;
|
||||
}
|
||||
}
|
||||
@@ -1,120 +0,0 @@
|
||||
/*
|
||||
* Copyright 2009, Ingo Weinhold, [email protected].
|
||||
* Distributed under the terms of the MIT License.
|
||||
*/
|
||||
|
||||
|
||||
#include "PackageDomain.h"
|
||||
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <NodeMonitor.h>
|
||||
|
||||
#include <AutoDeleter.h>
|
||||
|
||||
#include <fs/node_monitor.h>
|
||||
#include <Notifications.h>
|
||||
|
||||
#include "DebugSupport.h"
|
||||
|
||||
|
||||
PackageDomain::PackageDomain(::Volume* volume)
|
||||
:
|
||||
fVolume(volume),
|
||||
fPath(NULL),
|
||||
fDirFD(-1),
|
||||
fListener(NULL)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
PackageDomain::~PackageDomain()
|
||||
{
|
||||
PRINT("PackageDomain::~PackageDomain()\n");
|
||||
|
||||
if (fListener != NULL) {
|
||||
remove_node_listener(fDeviceID, fNodeID, *fListener);
|
||||
delete fListener;
|
||||
}
|
||||
|
||||
Package* package = fPackages.Clear(true);
|
||||
while (package != NULL) {
|
||||
Package* next = package->FileNameHashTableNext();
|
||||
package->ReleaseReference();
|
||||
package = next;
|
||||
}
|
||||
|
||||
if (fDirFD >= 0)
|
||||
close(fDirFD);
|
||||
|
||||
free(fPath);
|
||||
}
|
||||
|
||||
|
||||
status_t
|
||||
PackageDomain::Init(const char* path)
|
||||
{
|
||||
fPath = strdup(path);
|
||||
if (fPath == NULL)
|
||||
RETURN_ERROR(B_NO_MEMORY);
|
||||
|
||||
status_t error = fPackages.Init();
|
||||
if (error != B_OK)
|
||||
return error;
|
||||
|
||||
return B_OK;
|
||||
}
|
||||
|
||||
|
||||
status_t
|
||||
PackageDomain::Prepare(NotificationListener* listener)
|
||||
{
|
||||
ObjectDeleter<NotificationListener> listenerDeleter(listener);
|
||||
|
||||
fDirFD = open(fPath, O_RDONLY);
|
||||
if (fDirFD < 0) {
|
||||
ERROR("Failed to open package domain \"%s\"\n", strerror(errno));
|
||||
return errno;
|
||||
}
|
||||
|
||||
struct stat st;
|
||||
if (fstat(fDirFD, &st) < 0)
|
||||
RETURN_ERROR(errno);
|
||||
|
||||
fDeviceID = st.st_dev;
|
||||
fNodeID = st.st_ino;
|
||||
|
||||
status_t error = add_node_listener(fDeviceID, fNodeID, B_WATCH_DIRECTORY,
|
||||
*listener);
|
||||
if (error != B_OK)
|
||||
RETURN_ERROR(error);
|
||||
fListener = listenerDeleter.Detach();
|
||||
|
||||
return B_OK;
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
PackageDomain::AddPackage(Package* package)
|
||||
{
|
||||
fPackages.Insert(package);
|
||||
package->AcquireReference();
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
PackageDomain::RemovePackage(Package* package)
|
||||
{
|
||||
fPackages.Remove(package);
|
||||
package->ReleaseReference();
|
||||
}
|
||||
|
||||
|
||||
Package*
|
||||
PackageDomain::FindPackage(const char* fileName) const
|
||||
{
|
||||
return fPackages.Lookup(fileName);
|
||||
}
|
||||
@@ -1,55 +0,0 @@
|
||||
/*
|
||||
* Copyright 2009-2011, Ingo Weinhold, [email protected].
|
||||
* Distributed under the terms of the MIT License.
|
||||
*/
|
||||
#ifndef PACKAGE_DOMAIN_H
|
||||
#define PACKAGE_DOMAIN_H
|
||||
|
||||
|
||||
#include <Referenceable.h>
|
||||
|
||||
#include <util/DoublyLinkedList.h>
|
||||
|
||||
#include "Package.h"
|
||||
|
||||
|
||||
class NotificationListener;
|
||||
class Volume;
|
||||
|
||||
|
||||
class PackageDomain : public BReferenceable,
|
||||
public DoublyLinkedListLinkImpl<PackageDomain> {
|
||||
public:
|
||||
PackageDomain(::Volume* volume);
|
||||
~PackageDomain();
|
||||
|
||||
::Volume* Volume() const { return fVolume; }
|
||||
const char* Path() const { return fPath; }
|
||||
int DirectoryFD() { return fDirFD; }
|
||||
dev_t DeviceID() { return fDeviceID; }
|
||||
ino_t NodeID() { return fNodeID; }
|
||||
|
||||
status_t Init(const char* path);
|
||||
status_t Prepare(NotificationListener* listener);
|
||||
// takes over ownership of the listener
|
||||
|
||||
void AddPackage(Package* package);
|
||||
void RemovePackage(Package* package);
|
||||
|
||||
Package* FindPackage(const char* fileName) const;
|
||||
|
||||
const PackageFileNameHashTable& Packages() const
|
||||
{ return fPackages; }
|
||||
|
||||
private:
|
||||
::Volume* fVolume;
|
||||
char* fPath;
|
||||
int fDirFD;
|
||||
dev_t fDeviceID;
|
||||
ino_t fNodeID;
|
||||
NotificationListener* fListener;
|
||||
PackageFileNameHashTable fPackages;
|
||||
};
|
||||
|
||||
|
||||
#endif // PACKAGE_DOMAIN_H
|
||||
@@ -1,19 +0,0 @@
|
||||
/*
|
||||
* Copyright 2011, Ingo Weinhold, [email protected].
|
||||
* Distributed under the terms of the MIT License.
|
||||
*/
|
||||
|
||||
|
||||
#include "UnpackingNode.h"
|
||||
|
||||
|
||||
UnpackingNode::~UnpackingNode()
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
status_t
|
||||
UnpackingNode::CloneTransferPackageNodes(ino_t id, UnpackingNode*& _newNode)
|
||||
{
|
||||
return B_BAD_VALUE;
|
||||
}
|
||||
+17
-2
@@ -89,14 +89,29 @@ struct AttributeIndex::TreeDefinition {
|
||||
|
||||
int Compare(const Key& a, const Value* b) const
|
||||
{
|
||||
return QueryParser::compareKeys(fType, a.data, a.length, b->data,
|
||||
int cmp = QueryParser::compareKeys(fType, a.data, a.length, b->data,
|
||||
b->length);
|
||||
if (cmp != 0)
|
||||
return cmp;
|
||||
|
||||
// The attribute value is the same. Since the tree value is the tree
|
||||
// node itself, we must not return 0, though. We consider a node-less
|
||||
// key always less than an actual tree node with the same attribute
|
||||
// value.
|
||||
return -1;
|
||||
}
|
||||
|
||||
int Compare(const Value* a, const Value* b) const
|
||||
{
|
||||
return QueryParser::compareKeys(fType, a->data, a->length, b->data,
|
||||
if (a == b)
|
||||
return 0;
|
||||
|
||||
int cmp = QueryParser::compareKeys(fType, a->data, a->length, b->data,
|
||||
b->length);
|
||||
if (cmp != 0)
|
||||
return cmp;
|
||||
|
||||
return a < b ? -1 : 1;
|
||||
}
|
||||
|
||||
private:
|
||||
+4
-2
@@ -8,6 +8,8 @@
|
||||
|
||||
#include <SupportDefs.h>
|
||||
|
||||
#include "String.h"
|
||||
|
||||
|
||||
class AttributeIndex;
|
||||
class AttributeIndexTreeValue;
|
||||
@@ -28,12 +30,12 @@ public:
|
||||
AttributeIndexTreeValue* Cookie() const
|
||||
{ return fCookie; }
|
||||
|
||||
const char* IndexName() const
|
||||
const String& IndexName() const
|
||||
{ return fIndexName; }
|
||||
|
||||
private:
|
||||
AttributeIndex* fIndex;
|
||||
const char* fIndexName;
|
||||
const String& fIndexName;
|
||||
uint32 fIndexType;
|
||||
AttributeIndexTreeValue* fCookie;
|
||||
};
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user