Currently when the user selects "--include-sources" or sets HAIKU_INCLUDE_SOURCES=1, the source archives specified in build/jam/OptionalPackages are copied to develop/sources. Would it be ok, to * copy them to _packages_/Sources/develop/sources * AddVariableToScript $(script) : includeSources : $(HAIKU_INCLUDE_SOURCES:E=0) ; * then in build_haiku_image {{{ mkdir -p _packages_/Sources/develop/sources addattr -t string "INSTALLER PACKAGE: NAME" "Source Code Archives" addattr -t string "INSTALLER PACKAGE: DESCRIPTION" "Individually compressed source archives of included software." addattr -t string "INSTALLER PACKAGE: GROUP" "Options" addattr -t bool "INSTALLER PACKAGE: ON_BY_DEFAULT" false addattr -t bool "INSTALLER PACKAGE: ALWAYS_ON" false addattr -t float "INSTALLER PACKAGE: SIZE" `du -sb _packages_/Sources/develop/sources` }}} This will allow the user to opt-in to having Installer copy those source archives to the dest partition. It'll resolve #5481 as fixed/invalid #5785 is probably invalid already (though, i'm not sure how Installer automagically handles the isCDPackages from the build system) also, InstallSourceArchive could be further extended to support subdirectory targets. eg : {{{ # copy the source archive to _packages_/Sources/develop/sources/haiku/optional-packages/ InstallSourceArchive BeZillaBrowser-2010-01-21-src.7z : http://www.haiku-files.org/files/sources/2010/BeZillaBrowser-2010-01-21-src.7z : haiku optional-packages ; }}} --mmadia