1. removed bootable/recovery

2. edited build/core/pathmap.mk

ifneq ($(WITH_SIMPLE_RECOVERY),true)
    pathmap_INCL += recovery:bootable/recovery-cm
else
    pathmap_INCL += recovery:bootable/simplerecovery
endif

3. add following to hybris boot mk

HYBRIS_BOOTIMAGE_ARGS := \
        $(addprefix --second ,$(INSTALLED_2NDBOOTLOADER_TARGET)) \
        --kernel $(INSTALLED_KERNEL_TARGET) \
        --dt $(INSTALLED_DTIMAGE_TARGET)

4. Modify kernel/oneplus/msm8974/arch/arm/configs/cyanogenmod_bacon_defconfig
CONFIG_DUMMY=n

5. Modify out/target/product/bacon/root/ueventd.bacon.rc and ueventd.qcom.rc:
Remove/comment out these lines:
/dev/dvb/adapter0/demux*  0440   media       media
/dev/dvb/adapter0/dvr*    0660   media       media
/dev/dvb/adapter0/video*  0660   media       media

6. cd $ANDROID_ROOT
cat <<EOF > rpm/droid-hal-$DEVICE.spec
# device is the cyanogenmod codename for the device
# eg mako = Nexus 4
%define device bacon
# vendor is used in device/%vendor/%device/
%define vendor oneplus

# Manufacturer and device name to be shown in UI
%define vendor_pretty OnePlus
%define device_pretty One

%include rpm/droid-hal-device.inc
EOF

7. changed compostor conf to hwcomposer/hwcomposer

8. removed xt9 from ks