Opened 10 years ago

Closed 9 years ago

#10192 closed task (fixed)

Make UserlandFS an actual HPKG via build system

Reported by: mmadia Owned by: bonefish
Priority: normal Milestone: R1
Component: Build System Version: R1/Development
Keywords: Cc:
Blocked By: Blocking: #10191
Platform: All

Description (last modified by mmadia)

By making UserlandFS an actual HPKG, it could be included in the default image as a non-activated package. This would make testing easier for end users.

build/jam/OptionalPackages contains the pre-package management code. build/jam/packages contains several working examples.

Attachments (2)

userlandfs.diff (5.2 KB ) - added by jalopeura 9 years ago.
UserlandFS.patch (7.3 KB ) - added by jalopeura 9 years ago.

Download all attachments as: .zip

Change History (12)

comment:1 by mmadia, 10 years ago

Description: modified (diff)

comment:2 by mmadia, 10 years ago

Blocking: 10191 added

by jalopeura, 9 years ago

Attachment: userlandfs.diff added

comment:3 by jalopeura, 9 years ago

patch: 01

comment:4 by jalopeura, 9 years ago


  • Two hpkg files are generated: userlandfs.hpkg and userlandfs_devel.hpkg.
  • If you also have the Development package in your build, it will automatically create the second hpkg file; otherwise you only get the main file.
  • I don't know how to add a non-activated package, so it just follows the old method: you need to add UserlandFS as an optional package in your UserBuildConfig.
  • I did not verify that the files in the package work; I merely verfied that the packages were created and that when I moved them into system/packages, the files showed up in the right places.

comment:5 by waddlesplash, 9 years ago

Please correct the following:

  • Copyright should say 2014 not 2013
  • Patch should be in Git AM format (can be obtained by committing and then running git format-patch -1)

Otherwise looks OK to me, but I'm no Jam wizard.

by jalopeura, 9 years ago

Attachment: UserlandFS.patch added

comment:6 by jalopeura, 9 years ago

Corrections made.

I'm not a jam expert either. I just copied and modified existing files. All I care about is that the patch is generated and recognized by packagefs.

comment:7 by bonefish, 9 years ago

I haven't looked too closely at the package definition, but basically the patch looks good. However the part in build/jam/OptionalPackages should be removed completely. It is superfluous, since one can just as well add the AddPackageFilesToHaikuImage invocation to UserBuildConfig instead of AddOptionalHaikuImagePackages.

The packages should be added to build/jam/repositories/Haiku, though. This will add them to the package repository.

comment:8 by jalopeura, 9 years ago

If I put them in build/jam/repositories/Haiku, will they automatically be added to the repository, or do I still need to add something in UserBuild Config?

comment:9 by bonefish, 9 years ago

build/jam/repositories/Haiku defines what end up in the package repository. Once such a change has been pushed to the central repository, the next BuildBot run will automatically create and publish a package repository with the new package included.

comment:10 by pulkomandy, 9 years ago

Resolution: fixed
Status: newclosed

Done in hrev48317.

Note: See TracTickets for help on using tickets.